Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8299)

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 18615010: Refactor utility methods out of the ProfileManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unbreak rebase and added new static fn from trunk Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index f2073741fd7c19e50aba6b66407c54f06d199184..d1e1c309519d3d8a63e7a1b7d4477b26386b61b5 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -38,6 +38,8 @@
#include "chrome/browser/profiles/profile_info_util.h"
#include "chrome/browser/profiles/profile_metrics.h"
#include "chrome/browser/profiles/profile_shortcut_manager.h"
+#include "chrome/browser/profiles/profile_window.h"
+#include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_service.h"
@@ -132,7 +134,7 @@ bool ShouldShowMultiProfilesUserList(chrome::HostDesktopType desktop_type) {
#else
if (desktop_type != chrome::HOST_DESKTOP_TYPE_NATIVE)
return false;
- return ProfileManager::IsMultipleProfilesEnabled();
+ return profiles::IsMultipleProfilesEnabled();
#endif
}
@@ -161,7 +163,7 @@ void OpenNewWindowForProfile(
if (status != Profile::CREATE_STATUS_INITIALIZED)
return;
- ProfileManager::FindOrCreateNewWindowForProfile(
+ profiles::FindOrCreateNewWindowForProfile(
profile,
chrome::startup::IS_PROCESS_STARTUP,
chrome::startup::IS_FIRST_RUN,
@@ -1091,7 +1093,7 @@ void BrowserOptionsHandler::CreateProfile(const ListValue* args) {
return;
#endif
- if (!ProfileManager::IsMultipleProfilesEnabled())
+ if (!profiles::IsMultipleProfilesEnabled())
return;
DCHECK(profile_path_being_created_.empty());
@@ -1245,7 +1247,7 @@ void BrowserOptionsHandler::DeleteProfileAtPath(base::FilePath file_path) {
return;
#endif
- if (!ProfileManager::IsMultipleProfilesEnabled())
+ if (!profiles::IsMultipleProfilesEnabled())
return;
ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::PROFILE_DELETED);
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.h ('k') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698