Re-apply 192420: Move login switches to src/chromeos

chrome/browser/ui/startup/startup_browser_creator.cc

Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 1738248830bd0d0c58c8ef0ea814327a6bd9471f..08086b4994b48c585697a3dab22ff06e2523a23a 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -71,6 +71,7 @@
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/profile_startup.h"
+#include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
@@ -456,7 +457,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
 #if defined(OS_CHROMEOS)
     // kLoginManager will cause Chrome to start up with the ChromeOS login
     // screen instead of a browser window, so it won't load any tabs.
-    } else if (command_line.HasSwitch(switches::kLoginManager)) {
+    } else if (command_line.HasSwitch(chromeos::switches::kLoginManager)) {
       expected_tab_count = 0;
 #endif
     } else if (command_line.HasSwitch(switches::kRestoreLastSession)) {
@@ -568,8 +569,8 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
 
 #if defined(OS_CHROMEOS)
   // The browser will be launched after the user logs in.
-  if (command_line.HasSwitch(switches::kLoginManager) ||
-      command_line.HasSwitch(switches::kLoginPassword)) {
+  if (command_line.HasSwitch(chromeos::switches::kLoginManager) ||
+      command_line.HasSwitch(chromeos::switches::kLoginPassword)) {
     silent_launch = true;
   }