[go: nahoru, domu]

Notifier Framework: Toast Notifier Catalog

Added `ToastCatalogName` field to toasts as part of an effort to keep
better track of notifiers used in CrOS. (go/notifier-framework-sketch)
New toasts must be registered in this new toast_notifier_catalog.h file.

Also moved toast related files (toast_notifier_catalog, toast_data and
toast_manager) to ash/public/cpp/system/ dir.

Full table with all toasts and descriptions in go/notifier-catalogue.

Bug: 1286398
Change-Id: Ib511426300c1ff789a26857650d68c365b466689
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3378451
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Commit-Queue: Kevin Radtke <kradtke@chromium.org>
Cr-Commit-Position: refs/heads/main@{#960600}
diff --git a/ash/login/login_screen_controller.cc b/ash/login/login_screen_controller.cc
index 06f3ade..d8daa31c 100644
--- a/ash/login/login_screen_controller.cc
+++ b/ash/login/login_screen_controller.cc
@@ -13,7 +13,8 @@
 #include "ash/login/ui/login_data_dispatcher.h"
 #include "ash/public/cpp/child_accounts/parent_access_controller.h"
 #include "ash/public/cpp/login_screen_client.h"
-#include "ash/public/cpp/toast_data.h"
+#include "ash/public/cpp/system/toast_catalog.h"
+#include "ash/public/cpp/system/toast_data.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller_impl.h"
 #include "ash/shelf/login_shelf_view.h"
@@ -291,8 +292,8 @@
 }
 
 void LoginScreenController::ShowKioskAppError(const std::string& message) {
-  ToastData toast_data("KioskAppError", base::UTF8ToUTF16(message),
-                       ToastData::kInfiniteDuration,
+  ToastData toast_data("KioskAppError", ToastCatalogName::kKioskAppError,
+                       base::UTF8ToUTF16(message), ToastData::kInfiniteDuration,
                        /*visible_on_lock_screen=*/true);
   Shell::Get()->toast_manager()->Show(toast_data);
 }