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

Unified Diff: chrome/browser/chromeos/login/oobe_screen.cc

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: use base::Bind for timer start Created 3 years, 11 months 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/chromeos/login/oobe_screen.cc
diff --git a/chrome/browser/chromeos/login/oobe_screen.cc b/chrome/browser/chromeos/login/oobe_screen.cc
index 92678791766be059fe8b77a74b5424b79462d25a..ce06a5cff19d9a0cd9894193df5097ff08b2795f 100644
--- a/chrome/browser/chromeos/login/oobe_screen.cc
+++ b/chrome/browser/chromeos/login/oobe_screen.cc
@@ -34,6 +34,7 @@ const char* kScreenNames[] = {
"wrong-hwid", // SCREEN_WRONG_HWID
"auto-enrollment-check", // SCREEN_AUTO_ENROLLMENT_CHECK
"app-launch-splash", // SCREEN_APP_LAUNCH_SPLASH
+ "arc-kiosk-splash", // SCREEN_ARC_KIOSK_SPLASH
"confirm-password", // SCREEN_CONFIRM_PASSWORD
"fatal-error", // SCREEN_FATAL_ERROR
"controller-pairing", // SCREEN_OOBE_CONTROLLER_PAIRING
@@ -43,10 +44,10 @@ const char* kScreenNames[] = {
"userBoard", // SCREEN_USER_SELECTION
// SCREEN_ACTIVE_DIRECTORY_PASSWORD_CHANGE
"ad-password-change",
- "login", // SCREEN_SPECIAL_LOGIN
- "oobe", // SCREEN_SPECIAL_OOBE
- "test:nowindow", // SCREEN_TEST_NO_WINDOW
- "unknown", // SCREEN_UNKNOWN
+ "login", // SCREEN_SPECIAL_LOGIN
achuithb 2017/02/03 00:35:00 Why change this
Sergey Poromov 2017/02/03 15:15:36 Oops, looks like presubmit checks did it. Will try
+ "oobe", // SCREEN_SPECIAL_OOBE
+ "test:nowindow", // SCREEN_TEST_NO_WINDOW
+ "unknown", // SCREEN_UNKNOWN
};
static_assert(static_cast<size_t>(OobeScreen::SCREEN_UNKNOWN) ==

Powered by Google App Engine
This is Rietveld 408576698