Re-add support for login-screen.

BUG=248369 TEST=manual Review URL: https://chromiumcodereview.appspot.com/15679022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206278 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Jun 14, 2013 · 6a14b19 · 6a14b19
1 parent 36fc54f
commit 6a14b19
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -216,7 +216,10 @@ bool ShouldAutoLaunchKioskApp(const CommandLine& command_line) {
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
                                        Profile* profile) {
   if (parsed_command_line.HasSwitch(switches::kLoginManager)) {
-    ShowLoginWizard(std::string());
+    const std::string first_screen =
+        parsed_command_line.HasSwitch(switches::kLoginScreen) ?
+            WizardController::kLoginScreenName : std::string();
+    ShowLoginWizard(first_screen);
 
     if (KioskModeSettings::Get()->IsKioskModeEnabled())
       InitializeKioskModeScreensaver();

diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
@@ -149,6 +149,9 @@ const char kHasChromeOSDiamondKey[]         = "has-chromeos-diamond-key";
 // Path for the screensaver used in Kiosk mode
 const char kKioskModeScreensaverPath[]      = "kiosk-mode-screensaver-path";
 
+// Allows override of oobe for testing - goes directly to the login screen.
+const char kLoginScreen[]                   = "login-screen";
+
 // Enables Chrome-as-a-login-manager behavior.
 const char kLoginManager[]                  = "login-manager";
 

diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
@@ -59,6 +59,7 @@ CHROMEOS_EXPORT extern const char kGuestSession[];
 CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[];
 CHROMEOS_EXPORT extern const char kHasChromeOSKeyboard[];
 CHROMEOS_EXPORT extern const char kKioskModeScreensaverPath[];
+CHROMEOS_EXPORT extern const char kLoginScreen[];
 CHROMEOS_EXPORT extern const char kLoginManager[];
 CHROMEOS_EXPORT extern const char kLoginPassword[];
 CHROMEOS_EXPORT extern const char kLoginProfile[];