diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 18:55:45 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 18:55:45 +0000 |
| commit | bf5052f58a2bb109953396fb4a4dfb8e92d9c23f (patch) | |
| tree | 1d87ce1accf016e09aa1f3e673084d18ad800279 | |
| parent | 7d8750521cd0df8b3508f507e7f0c27e909852b4 (diff) | |
| download | chromium_src-bf5052f58a2bb109953396fb4a4dfb8e92d9c23f.zip chromium_src-bf5052f58a2bb109953396fb4a4dfb8e92d9c23f.tar.gz chromium_src-bf5052f58a2bb109953396fb4a4dfb8e92d9c23f.tar.bz2 | |
Initialize ExtensionInfoMap before ExtensionProcessManager
BUG=99394
TEST=none
Review URL: http://codereview.chromium.org/8265009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105344 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 956fc0c..81f6f39 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -369,8 +369,6 @@ void ProfileImpl::DoFinalInit() { g_browser_process->background_mode_manager()->RegisterProfile(this); } - extension_info_map_ = new ExtensionInfoMap(); - InitRegisteredProtocolHandlers(); clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit); @@ -443,6 +441,9 @@ void ProfileImpl::InitExtensions(bool extensions_enabled) { extension_devtools_manager_ = new ExtensionDevToolsManager(this); } + // The ExtensionInfoMap needs to be created before the + // ExtensionProcessManager. + extension_info_map_ = new ExtensionInfoMap(); extension_process_manager_.reset(ExtensionProcessManager::Create(this)); extension_event_router_.reset(new ExtensionEventRouter(this)); extension_message_service_ = new ExtensionMessageService(this); |