[go: nahoru, domu]

Add `has_dismiss_button` field to ToastData args

Have ToastData calls explicitly state if they have a dismiss button
through the `has_dismiss_button` argument.
If true, the dismiss button will use the default dismiss text unless a
`custom_dismiss_text` is given.

Bug: 1314543
Change-Id: I5f60bfaadb1e078c6857b9dbb0c9400f4fbde7d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3577113
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Kevin Radtke <kradtke@chromium.org>
Cr-Commit-Position: refs/heads/main@{#993369}
diff --git a/ash/login/login_screen_controller.cc b/ash/login/login_screen_controller.cc
index 67fc795..b22408c 100644
--- a/ash/login/login_screen_controller.cc
+++ b/ash/login/login_screen_controller.cc
@@ -299,7 +299,7 @@
   ToastData toast_data("KioskAppError", ToastCatalogName::kKioskAppError,
                        base::UTF8ToUTF16(message), ToastData::kInfiniteDuration,
                        /*visible_on_lock_screen=*/true,
-                       /*dismiss_text=*/std::u16string());
+                       /*has_dismiss_button=*/true);
   Shell::Get()->toast_manager()->Show(toast_data);
 }