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

trunk/src/chrome/browser/extensions/component_loader.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/extensions/component_loader.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 16 matching lines @@
 #include "extensions/common/id_util.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OFFICIAL_BUILD)
 #include "chrome/browser/defaults.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(ENABLE_APP_LIST)
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
 namespace extensions {
 
 namespace {
@@ skipping 301 matching lines @@
 #if defined(OFFICIAL_BUILD)
   if (browser_defaults::enable_help_app) {
     Add(IDR_HELP_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
                                "/usr/share/chromeos-assets/helpapp")));
   }
 #endif
 
   // Skip all other extensions that require user session presence.
   if (!skip_session_components) {
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (!command_line->HasSwitch(chromeos::switches::kGuestSession))
+    if (!command_line->HasSwitch(switches::kGuestSession))
       Add(IDR_BOOKMARKS_MANIFEST,
           base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
 
     Add(IDR_CROSH_BUILTIN_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
         "/usr/share/chromeos-assets/crosh_builtin")));
   }
 #else  // !defined(OS_CHROMEOS)
   DCHECK(!skip_session_components);
   Add(IDR_BOOKMARKS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
@@ skipping 47 matching lines @@
 
 #if defined(OS_CHROMEOS)
   if (!skip_session_components) {
     Add(IDR_WALLPAPERMANAGER_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
 
     if (browser_defaults::enable_component_quick_office) {
       // Don't load Quickoffice component extension in Guest mode because
       // it doesn't work in Incognito mode due to disabled temp fs.
       // TODO(dpolukhin): enable Quickoffice in Guest mode.
-      if (!command_line->HasSwitch(chromeos::switches::kGuestSession)) {
+      if (!command_line->HasSwitch(switches::kGuestSession)) {
         Add(IDR_QUICK_OFFICE_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
                                   "/usr/share/chromeos-assets/quick_office")));
       }
     }
 
     base::FilePath echo_extension_path(FILE_PATH_LITERAL(
         "/usr/share/chromeos-assets/echo"));
     if (command_line->HasSwitch(switches::kEchoExtensionPath)) {
       echo_extension_path =
           command_line->GetSwitchValuePath(switches::kEchoExtensionPath);
@@ skipping 34 matching lines @@
 void ComponentLoader::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
                                std::string() /* default_value */,
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kEnterpriseWebStoreName,
                                std::string() /* default_value */,
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace extensions