Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 // Physically remove deleted profile directories from disk. | 47 // Physically remove deleted profile directories from disk. |
| 48 static void NukeDeletedProfilesFromDisk(); | 48 static void NukeDeletedProfilesFromDisk(); |
| 49 | 49 |
| 50 // DEPRECATED: DO NOT USE unless in ChromeOS. | 50 // DEPRECATED: DO NOT USE unless in ChromeOS. |
| 51 // Returns the default profile. This adds the profile to the | 51 // Returns the default profile. This adds the profile to the |
| 52 // ProfileManager if it doesn't already exist. This method returns NULL if | 52 // ProfileManager if it doesn't already exist. This method returns NULL if |
| 53 // the profile doesn't exist and we can't create it. | 53 // the profile doesn't exist and we can't create it. |
| 54 // The profile used can be overridden by using --login-profile on cros. | 54 // The profile used can be overridden by using --login-profile on cros. |
| 55 Profile* GetDefaultProfile(const base::FilePath& user_data_dir); | 55 Profile* GetDefaultProfile(const base::FilePath& user_data_dir); |
| 56 | 56 |
| 57 // DEPRECATED: Temporary measure to ensure that GetDefaultProfile() is not | |
|
sail
2013/05/23 18:20:56
can you add a bug # that tracks removing this?
stevenjb
2013/05/23 18:28:15
Done. (Added above the first DEPRECATED function)
| |
| 58 // called before CreateProfile() is called in chrome_browser_main.cc. | |
| 59 // Note: This needs to be called with 'false' first (early in | |
| 60 // ChromeBrowserMainParts), otherwise it will assume 'true' so as not to | |
| 61 // affect any tests. | |
| 62 static void SetAllowGetDefaultProfile(bool allow); | |
| 63 | |
| 57 // DEPRECATED: DO NOT USE unless in ChromeOS. | 64 // DEPRECATED: DO NOT USE unless in ChromeOS. |
| 58 // Same as instance method but provides the default user_data_dir as well. | 65 // Same as instance method but provides the default user_data_dir as well. |
| 59 static Profile* GetDefaultProfile(); | 66 static Profile* GetDefaultProfile(); |
| 60 | 67 |
| 61 // DEPRECATED: DO NOT USE unless in ChromeOS. | 68 // DEPRECATED: DO NOT USE unless in ChromeOS. |
| 62 // Same as GetDefaultProfile() but returns OffTheRecord profile | 69 // Same as GetDefaultProfile() but returns OffTheRecord profile |
| 63 // if guest login. | 70 // if guest login. |
| 64 static Profile* GetDefaultProfileOrOffTheRecord(); | 71 static Profile* GetDefaultProfileOrOffTheRecord(); |
| 65 | 72 |
| 66 // Returns a profile for a specific profile directory within the user data | 73 // Returns a profile for a specific profile directory within the user data |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 373 class ProfileManagerWithoutInit : public ProfileManager { | 380 class ProfileManagerWithoutInit : public ProfileManager { |
| 374 public: | 381 public: |
| 375 explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir); | 382 explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir); |
| 376 | 383 |
| 377 protected: | 384 protected: |
| 378 virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {} | 385 virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {} |
| 379 virtual void DoFinalInitLogging(Profile*) OVERRIDE {} | 386 virtual void DoFinalInitLogging(Profile*) OVERRIDE {} |
| 380 }; | 387 }; |
| 381 | 388 |
| 382 #endif // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ | 389 #endif // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_ |
| OLD | NEW |