Refactor utility methods out of the ProfileManager

chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
+#include "chrome/browser/profiles/profile_manager_util.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 76 matching lines @@
 
 namespace {
 
 bool ShouldShowMultiProfilesUserList(chrome::HostDesktopType desktop_type) {
 #if defined(OS_CHROMEOS)
   // On Chrome OS we use different UI for multi-profiles.
   return false;
 #else
   if (desktop_type != chrome::HOST_DESKTOP_TYPE_NATIVE)
     return false;
-  return ProfileManager::IsMultipleProfilesEnabled();
+  return profiles::IsMultipleProfilesEnabled();
 #endif
 }
 
 void CreateDesktopShortcutForProfile(Profile* profile,
                                      Profile::CreateStatus status) {
   ProfileShortcutManager* shortcut_manager =
       g_browser_process->profile_manager()->profile_shortcut_manager();
   if (shortcut_manager)
     shortcut_manager->CreateProfileShortcut(profile->GetPath());
 }
 
 void RunProfileCreationCallbacks(
     const std::vector<ProfileManager::CreateCallback>& callbacks,
     Profile* profile,
     Profile::CreateStatus status) {
   std::vector<ProfileManager::CreateCallback>::const_iterator it;
   for (it = callbacks.begin(); it != callbacks.end(); ++it) {
     it->Run(profile, status);
   }
 }
 
 void OpenNewWindowForProfile(
     chrome::HostDesktopType desktop_type,
     Profile* profile,
     Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
 
-  ProfileManager::FindOrCreateNewWindowForProfile(
+  profiles::FindOrCreateNewWindowForProfile(
     profile,
     chrome::startup::IS_PROCESS_STARTUP,
     chrome::startup::IS_FIRST_RUN,
     desktop_type,
     false);
 }
 
 }  // namespace
 
 BrowserOptionsHandler::BrowserOptionsHandler()
@@ skipping 909 matching lines @@
 
 void BrowserOptionsHandler::CreateProfile(const ListValue* args) {
 #if defined(ENABLE_MANAGED_USERS)
   // This handler could have been called in managed mode, for example because
   // the user fiddled with the web inspector. Silently return in this case.
   Profile* current_profile = Profile::FromWebUI(web_ui());
   if (ManagedUserService::ProfileIsManaged(current_profile))
     return;
 #endif
 
-  if (!ProfileManager::IsMultipleProfilesEnabled())
+  if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   DCHECK(profile_path_being_created_.empty());
   profile_creation_start_time_ = base::TimeTicks::Now();
 
   string16 name;
   string16 icon;
   bool create_shortcut = false;
   bool managed_user = false;
   if (args->GetString(0, &name) && args->GetString(1, &icon)) {
@@ skipping 133 matching lines @@
 }
 
 void BrowserOptionsHandler::DeleteProfileAtPath(base::FilePath file_path) {
 #if defined(ENABLE_MANAGED_USERS)
   // This handler could have been called in managed mode, for example because
   // the user fiddled with the web inspector. Silently return in this case.
   if (ManagedUserService::ProfileIsManaged(Profile::FromWebUI(web_ui())))
     return;
 #endif
 
-  if (!ProfileManager::IsMultipleProfilesEnabled())
+  if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::PROFILE_DELETED);
 
   g_browser_process->profile_manager()->ScheduleProfileForDeletion(
       file_path,
       base::Bind(&OpenNewWindowForProfile, GetDesktopType()));
 }
 
 void BrowserOptionsHandler::HandleCancelProfileCreation(const ListValue* args) {
@@ skipping 460 matching lines @@
   base::FundamentalValue disabled(proxy_config &&
                                   !proxy_config->IsUserModifiable());
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options