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

Unified Diff: chrome/browser/profiles/profile_manager.h

Issue 1128173005: Clean up ProfileManager interface. Base URL: https://chromium.googlesource.com/chromium/src@issue479309
Patch Set: sync Created 5 years, 7 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
« no previous file with comments | « chrome/browser/profiles/profile_android.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_manager.h
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index f502168e6f180e5ba2688b30fb20d6797dc812d2..e78e253f527b54dcc238636a4ec90d281153668a 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -44,19 +44,6 @@ class ProfileManager : public base::NonThreadSafe,
// Physically remove deleted profile directories from disk.
static void NukeDeletedProfilesFromDisk();
- // Same as instance method but provides the default user_data_dir as well.
- // If the Profile is going to be used to open a new window then consider using
- // GetLastUsedProfileAllowedByPolicy() instead.
- static Profile* GetLastUsedProfile();
-
- // Same as GetLastUsedProfile() but returns the incognito Profile if
- // incognito mode is forced. This should be used if the last used Profile
- // will be used to open new browser windows.
- static Profile* GetLastUsedProfileAllowedByPolicy();
-
- // Same as instance method but provides the default user_data_dir as well.
- static std::vector<Profile*> GetLastOpenedProfiles();
-
// Get the profile for the user which created the current session.
// Note that in case of a guest account this will return a 'suitable' profile.
// This function is temporary and will soon be moved to ash. As such avoid
@@ -104,11 +91,18 @@ class ProfileManager : public base::NonThreadSafe,
// Get the Profile last used (the Profile to which owns the most recently
// focused window) with this Chrome build. If no signed profile has been
// stored in Local State, hand back the Default profile.
- Profile* GetLastUsedProfile(const base::FilePath& user_data_dir);
+ // If the Profile is going to be used to open a new window then consider using
+ // GetLastUsedProfileAllowedByPolicy() instead.
+ Profile* GetLastUsedProfile();
+
+ // Same as GetLastUsedProfile() but returns the incognito Profile if
+ // incognito mode is forced. This should be used if the last used Profile
+ // will be used to open new browser windows.
+ Profile* GetLastUsedProfileAllowedByPolicy();
// Get the path of the last used profile, or if that's undefined, the default
// profile.
- base::FilePath GetLastUsedProfileDir(const base::FilePath& user_data_dir);
+ base::FilePath GetLastUsedProfileDir();
// Get the name of the last used profile, or if that's undefined, the default
// profile.
@@ -119,8 +113,7 @@ class ProfileManager : public base::NonThreadSafe,
// order they were opened. The last used profile will be on the list, but its
// index on the list will depend on when it was opened (it is not necessarily
// the last one).
- std::vector<Profile*> GetLastOpenedProfiles(
- const base::FilePath& user_data_dir);
+ std::vector<Profile*> GetLastOpenedProfiles();
// Returns created and fully initialized profiles. Note, profiles order is NOT
// guaranteed to be related with the creation order.
@@ -252,8 +245,7 @@ class ProfileManager : public base::NonThreadSafe,
// already exist. The method will return NULL if the profile doesn't exist
// and we can't create it.
// The profile used can be overridden by using --login-profile on cros.
- Profile* GetActiveUserOrOffTheRecordProfileFromPath(
- const base::FilePath& user_data_dir);
+ Profile* GetActiveUserOrOffTheRecordProfileFromPath();
// Adds a pre-existing Profile object to the set managed by this
// ProfileManager. This ProfileManager takes ownership of the Profile.
« no previous file with comments | « chrome/browser/profiles/profile_android.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698