Reworked ExtensionsService::AddPendingExtension().

chrome/browser/extensions/extensions_service.h

Index: chrome/browser/extensions/extensions_service.h
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index 07bfa8b1074efcc000427e1701533f644deff4be..f75d3603c6626a2d22faba4b886c175c671296d7 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -48,16 +48,18 @@ class Version;
 // default one is assumed.
 struct PendingExtensionInfo {
   PendingExtensionInfo(const GURL& update_url,
-                       const Version& version,
                        bool is_theme,
-                       bool install_silently);
+                       bool install_silently,
+                       bool enable_on_install,
+                       bool enable_incognito_on_install);
 
   PendingExtensionInfo();
 
   GURL update_url;
-  Version version;
   bool is_theme;
   bool install_silently;
+  bool enable_on_install;
+  bool enable_incognito_on_install;
 };
 
 // A PendingExtensionMap is a map from IDs of pending extensions to
@@ -201,11 +203,12 @@ class ExtensionsService
   // It is an error to call this with an already-installed extension
   // (even a disabled one).
   //
-  // TODO(akalin): Make sure that all the places that check for
-  // existing versions also consult the pending extension info.
+  // TODO(akalin): Replace |install_silently| with a list of
+  // pre-enabled permissions.
   void AddPendingExtension(
       const std::string& id, const GURL& update_url,
-      const Version& version, bool is_theme, bool install_silently);
+      bool is_theme, bool install_silently,
+      bool enable_on_install, bool enable_incognito_on_install);
 
   // Reloads the specified extension.
   void ReloadExtension(const std::string& extension_id);
@@ -360,7 +363,8 @@ class ExtensionsService
   // id is not already installed.
   void AddPendingExtensionInternal(
       const std::string& id, const GURL& update_url,
-      const Version& version, bool is_theme, bool install_silently);
+      bool is_theme, bool install_silently,
+      bool enable_on_install, bool enable_incognito_on_install);
 
   // Handles sending notification that |extension| was loaded.
   void NotifyExtensionLoaded(Extension* extension);