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

trunk/src/chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 53 matching lines @@
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #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)
 #include "ui/base/touch/touch_factory_x11.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/automation/chrome_frame_automation_provider_win.h"
 #include "chrome/browser/ui/startup/startup_browser_creator_win.h"
 #endif
@@ skipping 365 matching lines @@
     // compatibility with the old testing code
     // If there are any extra parameters, we expect each one to generate a
     // new tab; if there are none then we get one homepage tab.
     int expected_tab_count = 1;
     if (command_line.HasSwitch(switches::kNoStartupWindow) &&
         !command_line.HasSwitch(switches::kAutoLaunchAtStartup)) {
       expected_tab_count = 0;
 #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(chromeos::switches::kLoginManager)) {
+    } else if (command_line.HasSwitch(switches::kLoginManager)) {
       expected_tab_count = 0;
 #endif
     } else if (command_line.HasSwitch(switches::kRestoreLastSession)) {
       std::string restore_session_value(
           command_line.GetSwitchValueASCII(switches::kRestoreLastSession));
       base::StringToInt(restore_session_value, &expected_tab_count);
     } else {
       std::vector<GURL> urls_to_open = GetURLsFromCommandLine(
           command_line, cur_dir, last_used_profile);
       expected_tab_count =
@@ skipping 91 matching lines @@
   }
 
   if (command_line.HasSwitch(switches::kLimitedInstallFromWebstore)) {
     extensions::StartupHelper helper;
     helper.LimitedInstallFromWebstore(command_line, last_used_profile,
                                       base::Bind(&base::DoNothing));
   }
 
 #if defined(OS_CHROMEOS)
   // The browser will be launched after the user logs in.
-  if (command_line.HasSwitch(chromeos::switches::kLoginManager) ||
-      command_line.HasSwitch(chromeos::switches::kLoginPassword)) {
+  if (command_line.HasSwitch(switches::kLoginManager) ||
+      command_line.HasSwitch(switches::kLoginPassword)) {
     silent_launch = true;
   }
 
   if (chrome::IsRunningInAppMode() &&
       command_line.HasSwitch(switches::kAppId)) {
     // StartupAppLauncher deletes itself when done.
     (new chromeos::StartupAppLauncher(
         last_used_profile,
         command_line.GetSwitchValueASCII(switches::kAppId)))->Start();
 
@@ skipping 137 matching lines @@
 
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }