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

Unified Diff: chrome/browser/extensions/extension_process_manager.cc

Issue 5168004: Revert 66646 - Add "open as window" menu item to NTP app menu.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_process_manager.cc
===================================================================
--- chrome/browser/extensions/extension_process_manager.cc (revision 66663)
+++ chrome/browser/extensions/extension_process_manager.cc (working copy)
@@ -279,15 +279,18 @@
const NotificationSource& source,
const NotificationDetails& details) {
switch (type.value) {
- case NotificationType::EXTENSIONS_READY: {
+ case NotificationType::EXTENSIONS_READY:
CreateBackgroundHosts(this,
Source<Profile>(source).ptr()->GetExtensionsService()->extensions());
break;
- }
case NotificationType::EXTENSION_LOADED: {
- const Extension* extension = Details<const Extension>(details).ptr();
- ::CreateBackgroundHost(this, extension);
+ ExtensionsService* service =
+ Source<Profile>(source).ptr()->GetExtensionsService();
+ if (service->is_ready()) {
+ const Extension* extension = Details<const Extension>(details).ptr();
+ ::CreateBackgroundHost(this, extension);
+ }
break;
}
@@ -451,7 +454,8 @@
if (browser->profile() == browsing_instance_->profile()) {
ExtensionsService* service =
browsing_instance_->profile()->GetExtensionsService();
- CreateBackgroundHosts(this, service->extensions());
+ if (service && service->is_ready())
+ CreateBackgroundHosts(this, service->extensions());
}
break;
}
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_startup_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698