diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 00:05:08 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 00:05:08 +0000 |
| commit | d33b2379837d0688b8011e7d48455bd9d2253fe4 (patch) | |
| tree | 945de461f8537f381bde6522199ab30a983ed98c /chrome/browser/profiles | |
| parent | badb8e4573195e639f2db13ec8fa16464ec03e0a (diff) | |
| download | chromium_src-d33b2379837d0688b8011e7d48455bd9d2253fe4.zip chromium_src-d33b2379837d0688b8011e7d48455bd9d2253fe4.tar.gz chromium_src-d33b2379837d0688b8011e7d48455bd9d2253fe4.tar.bz2 | |
Start the extension event routers for each profile, not just at browser startup.
Fix browser event router's browser notification registration profile check.
Original review at http://codereview.chromium.org/6976030
BUG=84059
TEST=sync_integration_tests don't crash this time
Review URL: http://codereview.chromium.org/7400003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index aff0315..649a8fa 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -484,6 +484,16 @@ void ProfileImpl::InitExtensions(bool extensions_enabled) { // Make the chrome://extension-icon/ resource available. GetChromeURLDataManager()->AddDataSource(new ExtensionIconSource(this)); + + // Initialize extension event routers. Note that on Chrome OS, this will + // not succeed if the user has not logged in yet, in which case the + // event routers are initialized in LoginUtilsImpl::CompleteLogin instead. + // The InitEventRouters call used to be in BrowserMain, because when bookmark + // import happened on first run, the bookmark bar was not being correctly + // initialized (see issue 40144). Now that bookmarks aren't imported and + // the event routers need to be initialized for every profile individually, + // initialize them with the extension service. + extension_service_->InitEventRouters(); } void ProfileImpl::RegisterComponentExtensions() { |