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

Side by Side Diff: chrome/browser/profiles/profile_manager.h

Issue 119593002: Getting rid of temporary IsGetDefaultProfileAllowed instrumentation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This class keeps track of the currently-active profiles in the runtime. 5 // This class keeps track of the currently-active profiles in the runtime.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
9 9
10 #include <list> 10 #include <list>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 // The following DEPRECATED functions should be removed: crbug.com/83792. 70 // The following DEPRECATED functions should be removed: crbug.com/83792.
71 71
72 // DEPRECATED: DO NOT USE unless in ChromeOS. 72 // DEPRECATED: DO NOT USE unless in ChromeOS.
73 // Returns the default profile. This adds the profile to the 73 // Returns the default profile. This adds the profile to the
74 // ProfileManager if it doesn't already exist. This method returns NULL if 74 // ProfileManager if it doesn't already exist. This method returns NULL if
75 // the profile doesn't exist and we can't create it. 75 // the profile doesn't exist and we can't create it.
76 // The profile used can be overridden by using --login-profile on cros. 76 // The profile used can be overridden by using --login-profile on cros.
77 Profile* GetDefaultProfile(const base::FilePath& user_data_dir); 77 Profile* GetDefaultProfile(const base::FilePath& user_data_dir);
78 78
79 // DEPRECATED: Temporary measure to ensure that GetDefaultProfile() is not
80 // called before CreateProfile() is called in chrome_browser_main.cc.
81 // If GetDefaultProfile() or GetDefaultProfileOrOffTheRecord() is called
82 // before this, a CHECK will be triggered.
83 static void AllowGetDefaultProfile();
84 static bool IsGetDefaultProfileAllowed();
85
86 // DEPRECATED: DO NOT USE unless in ChromeOS. 79 // DEPRECATED: DO NOT USE unless in ChromeOS.
87 // Same as instance method but provides the default user_data_dir as well. 80 // Same as instance method but provides the default user_data_dir as well.
88 // Note that in case of a guest account this will return a 'suitable' profile. 81 // Note that in case of a guest account this will return a 'suitable' profile.
89 static Profile* GetDefaultProfile(); 82 static Profile* GetDefaultProfile();
90 83
91 // DEPRECATED: DO NOT USE unless in ChromeOS. 84 // DEPRECATED: DO NOT USE unless in ChromeOS.
92 // Same as GetDefaultProfile(). Do not use. 85 // Same as GetDefaultProfile(). Do not use.
93 static Profile* GetDefaultProfileOrOffTheRecord(); 86 static Profile* GetDefaultProfileOrOffTheRecord();
94 87
95 // Returns a profile for a specific profile directory within the user data 88 // Returns a profile for a specific profile directory within the user data
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 class ProfileManagerWithoutInit : public ProfileManager { 381 class ProfileManagerWithoutInit : public ProfileManager {
389 public: 382 public:
390 explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir); 383 explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir);
391 384
392 protected: 385 protected:
393 virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {} 386 virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {}
394 virtual void DoFinalInitLogging(Profile*) OVERRIDE {} 387 virtual void DoFinalInitLogging(Profile*) OVERRIDE {}
395 }; 388 };
396 389
397 #endif // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ 390 #endif // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/power/power_prefs_unittest.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698