Index: chrome/browser/extensions/extension_process_manager.cc |
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc |
index ae861fa34d8edd40929db103c9f28a5fa0849211..c737aa2376f6c479d57ba00fe1a2a87fc154444c 100644 |
--- a/chrome/browser/extensions/extension_process_manager.cc |
+++ b/chrome/browser/extensions/extension_process_manager.cc |
@@ -137,6 +137,7 @@ ExtensionProcessManager* ExtensionProcessManager::Create(Profile* profile) { |
ExtensionProcessManager::ExtensionProcessManager(Profile* profile) |
: site_instance_(SiteInstance::Create(profile)), |
+ defer_background_host_creation_(false), |
weak_ptr_factory_(this), |
devtools_callback_(base::Bind( |
&ExtensionProcessManager::OnDevToolsStateChanged, |
@@ -544,6 +545,16 @@ void ExtensionProcessManager::CancelSuspend(const Extension* extension) { |
} |
} |
+void ExtensionProcessManager::DeferBackgroundHostCreation(bool defer) { |
+ bool previous = defer_background_host_creation_; |
+ defer_background_host_creation_ = defer; |
+ |
+ // If we were deferred, and we switch to non-deferred, then create the |
+ // background hosts. |
+ if (previous && !defer_background_host_creation_) |
+ CreateBackgroundHostsForProfileStartup(); |
+} |
+ |
void ExtensionProcessManager::Observe( |
int type, |
const content::NotificationSource& source, |
@@ -699,6 +710,9 @@ void ExtensionProcessManager::OnDevToolsStateChanged( |
} |
void ExtensionProcessManager::CreateBackgroundHostsForProfileStartup() { |
+ if (defer_background_host_creation_) |
+ return; |
+ |
ExtensionService* service = GetProfile()->GetExtensionService(); |
for (ExtensionSet::const_iterator extension = service->extensions()->begin(); |
extension != service->extensions()->end(); ++extension) { |