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

trunk/src/chrome/browser/ui/ash/ash_init.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/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 14 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/compositor_setup.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/ui/ash/brightness_controller_chromeos.h"
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
-#include "chromeos/chromeos_switches.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
 #if defined(OS_CHROMEOS)
   return true;
 #endif
   // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
 }
 
 #if defined(OS_CHROMEOS)
 // Returns true if the cursor should be initially hidden.
 bool ShouldInitiallyHideCursor() {
   if (base::chromeos::IsRunningOnChromeOS())
     return !chromeos::UserManager::Get()->IsUserLoggedIn();
   else
-    return CommandLine::ForCurrentProcess()->HasSwitch(
-        chromeos::switches::kLoginManager);
+    return CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager);
 }
 #endif
 
 void OpenAsh() {
 #if defined(OS_CHROMEOS)
   if (base::chromeos::IsRunningOnChromeOS()) {
     // Hides the cursor outside of the Aura root window. The cursor will be
     // drawn within the Aura root window, and it'll remain hidden after the
     // Aura window is closed.
     ui::HideHostCursor();
@@ skipping 46 matching lines @@
 void CloseAsh() {
   // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't
   // try to cleanup resources.
   if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&
       ash::Shell::HasInstance()) {
     ash::Shell::DeleteInstance();
   }
 }
 
 }  // namespace chrome