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

trunk/src/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

 // Copyright 2013 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/chrome_shell_delegate.h"
 
 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/window_util.h"
@@ skipping 22 matching lines @@
 #include "chrome/browser/ui/ash/window_positioner.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 bool ChromeShellDelegate::IsUserLoggedIn() const {
   // When running a Chrome OS build outside of a device (i.e. on a developer's
   // workstation) and not running as login-manager, pretend like we're always
   // logged in.
   if (!base::chromeos::IsRunningOnChromeOS() &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kLoginManager)) {
+      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager)) {
     return true;
   }
 
   return chromeos::UserManager::Get()->IsUserLoggedIn();
 }
 
 bool ChromeShellDelegate::IsSessionStarted() const {
   // Returns true if we're logged in and browser has been started
   return chromeos::UserManager::Get()->IsSessionStarted();
 }
 
 bool ChromeShellDelegate::IsGuestSession() const {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kGuestSession);
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
 }
 
 bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kFirstBoot);
+  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kFirstBoot);
 }
 
 bool ChromeShellDelegate::CanLockScreen() const {
   return chromeos::UserManager::Get()->CanCurrentUserLock();
 }
 
 void ChromeShellDelegate::LockScreen() {
   if (CanLockScreen()) {
     // TODO(antrim) : additional logging for crbug/173178
     LOG(WARNING) << "Requesting screen lock from ChromeShellDelegate";
@@ skipping 212 matching lines @@
 }
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }