Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3468)

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Issue 83293004: kiosk: Show enrollment screen first if needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix LOG(INFO) Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index d5afc7ecccd774b60d208dcf8244e77475fdf4aa..e3588c3b6aacedb8af193c8491b1469ddeed88cc 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -36,6 +36,7 @@ const char kJsApiEnableLargeCursor[] = "enableLargeCursor";
const char kJsApiEnableSpokenFeedback[] = "enableSpokenFeedback";
const char kJsApiScreenStateInitialize[] = "screenStateInitialize";
const char kJsApiSkipUpdateEnrollAfterEula[] = "skipUpdateEnrollAfterEula";
+const char kJsApiScreenAssetsLoaded[] = "screenAssetsLoaded";
} // namespace
@@ -131,6 +132,8 @@ void CoreOobeHandler::RegisterMessages() {
&CoreOobeHandler::HandleEnableSpokenFeedback);
AddCallback("setDeviceRequisition",
&CoreOobeHandler::HandleSetDeviceRequisition);
+ AddCallback(kJsApiScreenAssetsLoaded,
+ &CoreOobeHandler::HandleScreenAssetsLoaded);
AddRawCallback("skipToLoginForTesting",
&CoreOobeHandler::HandleSkipToLoginForTesting);
}
@@ -238,6 +241,11 @@ void CoreOobeHandler::HandleSetDeviceRequisition(
chrome::ExitCleanly();
}
+void CoreOobeHandler::HandleScreenAssetsLoaded(
+ const std::string& screen_async_load_id) {
+ oobe_ui_->OnScreenAssetsLoaded(screen_async_load_id);
+}
+
void CoreOobeHandler::HandleSkipToLoginForTesting(
const base::ListValue* args) {
LoginScreenContext context(args);

Powered by Google App Engine
This is Rietveld 408576698