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

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

Issue 15695010: Add ProfileManager::AllowGetDefaultProfile() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browsertest Created 7 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
Index: chrome/browser/profiles/profile_manager.h
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index 5b55baa8e0359141f140b70677ff497df9bae81c..ef2b0a2685cd98fb628245e3d1a0943c5620eee8 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -47,6 +47,8 @@ class ProfileManager : public base::NonThreadSafe,
// Physically remove deleted profile directories from disk.
static void NukeDeletedProfilesFromDisk();
+ // The following DEPRECATED functions should be removed: crbug.com/83792.
+
// DEPRECATED: DO NOT USE unless in ChromeOS.
// Returns the default profile. This adds the profile to the
// ProfileManager if it doesn't already exist. This method returns NULL if
@@ -54,6 +56,12 @@ class ProfileManager : public base::NonThreadSafe,
// The profile used can be overridden by using --login-profile on cros.
Profile* GetDefaultProfile(const base::FilePath& user_data_dir);
+ // DEPRECATED: Temporary measure to ensure that GetDefaultProfile() is not
+ // called before CreateProfile() is called in chrome_browser_main.cc.
+ // If GetDefaultProfile() or GetDefaultProfileOrOffTheRecord() is called
+ // before this, a CHECK will be triggered.
+ static void AllowGetDefaultProfile();
+
// DEPRECATED: DO NOT USE unless in ChromeOS.
// Same as instance method but provides the default user_data_dir as well.
static Profile* GetDefaultProfile();
« no previous file with comments | « chrome/browser/chromeos/login/login_utils_browsertest.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698