diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 19:29:55 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 19:29:55 +0000 |
| commit | 8e6986af5167094c71bba75c2659899c8c949f69 (patch) | |
| tree | 219ae75e585471bf533a113297465353b00ec020 /chrome/browser/profiles | |
| parent | 9b730732f8dbdb44283e6cebaf7cf39ff53bb07b (diff) | |
| download | chromium_src-8e6986af5167094c71bba75c2659899c8c949f69.zip chromium_src-8e6986af5167094c71bba75c2659899c8c949f69.tar.gz chromium_src-8e6986af5167094c71bba75c2659899c8c949f69.tar.bz2 | |
Call OpenAsh before Profile Init and CreateLauncher() after
This partially undoes the changes from
https://chromiumcodereview.appspot.com/15702004
Rather than initializing Ash after Profile Init, initialize Ash first
and postpone CreateLauncher() and any other calls that may depend on
GetDefaultProfile() until after profiles have been initialized.
BUG=245055
Review URL: https://chromiumcodereview.appspot.com/16229008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_manager.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_manager.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index b3cfdb2..19f2279 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -219,6 +219,11 @@ void ProfileManager::AllowGetDefaultProfile() { } // static +bool ProfileManager::IsGetDefaultProfileAllowed() { + return s_allow_get_default_profile; +} + +// static // TODO(nkostylev): Remove this method once all clients are migrated. Profile* ProfileManager::GetDefaultProfile() { CHECK(s_allow_get_default_profile) diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index fc1907c..0333959 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -61,6 +61,7 @@ class ProfileManager : public base::NonThreadSafe, // If GetDefaultProfile() or GetDefaultProfileOrOffTheRecord() is called // before this, a CHECK will be triggered. static void AllowGetDefaultProfile(); + static bool IsGetDefaultProfileAllowed(); // DEPRECATED: DO NOT USE unless in ChromeOS. // Same as instance method but provides the default user_data_dir as well. |