Lazy creating of background pages --enable-lazy-background-pages)

chrome/browser/extensions/extension_process_manager.cc

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 f64624c2588ff844e10f21e1eb4623c78bb0b87d..8090581a3b3a2cd909bd7f8f1a0904f2cc16a30d 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/command_line.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 
 #include "chrome/browser/ui/browser_window.h"
@@ -14,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
@@ -55,10 +57,12 @@ class IncognitoExtensionProcessManager : public ExtensionProcessManager {
   ExtensionProcessManager* original_manager_;
 };
 
-static void CreateBackgroundHost(
+static void MaybeCreateBackgroundHost(
     ExtensionProcessManager* manager, const Extension* extension) {
-  // Start the process for the master page, if it exists.
-  if (extension->background_url().is_valid())
+  // Start the process for the master page, if it exists and we're not lazy.
+  if (extension->background_url().is_valid() &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(

[Aaron Boodman, 2011/08/17 04:24:15]

If you put this check in CreateBackgroundHosts() then you can leave this name
the way it was, and CreateBackgroundHost() will be more flexible.

[Tessa MacDuff, 2011/08/17 17:51:24]

But then I'd only be handling the background pages that get created after a
NOTIFICATIONS_EXTENSIONS_READY (chrome startup?).  What about
NOTIFICATIONS_EXTENSION_LOADED (reloading an extension)?  See
ExtensionProcessManager::Observe() on line 290 below.

[Aaron Boodman, 2011/08/17 18:13:35]

Oh, good point. Nevermind.

+          switches::kEnableLazyBackgroundPages))
     manager->CreateBackgroundHost(extension, extension->background_url());
 }
 
@@ -66,7 +70,7 @@ static void CreateBackgroundHosts(
     ExtensionProcessManager* manager, const ExtensionList* extensions) {
   for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
-    CreateBackgroundHost(manager, *extension);
+    MaybeCreateBackgroundHost(manager, *extension);
   }
 }
 
@@ -298,7 +302,7 @@ void ExtensionProcessManager::Observe(int type,
           Source<Profile>(source).ptr()->GetExtensionService();
       if (service->is_ready()) {
         const Extension* extension = Details<const Extension>(details).ptr();
-        ::CreateBackgroundHost(this, extension);
+        ::MaybeCreateBackgroundHost(this, extension);
       }
       break;
     }