Reworked ExtensionsService::AddPendingExtension().

chrome/browser/extensions/extensions_service.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 30 matching lines @@
 class ResourceDispatcherHost;
 class SiteInstance;
 class Version;
 
 // A pending extension is an extension that hasn't been installed yet
 // and is intended to be installed in the next auto-update cycle.  The
 // update URL of a pending extension may be blank, in which case a
 // 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
 // their info.
 typedef std::map<std::string, PendingExtensionInfo> PendingExtensionMap;
 
 // This is an interface class to encapsulate the dependencies that
 // ExtensionUpdater has on ExtensionsService. This allows easy mocking.
 class ExtensionUpdateService {
  public:
@@ skipping 123 matching lines @@
   virtual void UpdateExtension(const std::string& id,
                                const FilePath& extension_path,
                                const GURL& download_url);
 
   // Adds an extension in a pending state; the extension with the
   // given info will be installed on the next auto-update cycle.
   //
   // 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);
 
   // Uninstalls the specified extension. Callers should only call this method
   // with extensions that exist. |external_uninstall| is a magical parameter
   // that is only used to send information to ExtensionPrefs, which external
   // callers should never set to true.
   // TODO(aa): Remove |external_uninstall| -- this information should be passed
   // to ExtensionPrefs some other way.
@@ skipping 134 matching lines @@
   // Look up an extension by ID, optionally including either or both of enabled
   // and disabled extensions.
   Extension* GetExtensionByIdInternal(const std::string& id,
                                       bool include_enabled,
                                       bool include_disabled);
 
   // Like AddPendingExtension() but assumes an extension with the same
   // 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);
 
   // Handles sending notification that |extension| was unloaded.
   void NotifyExtensionUnloaded(Extension* extension);
 
   // Helper that updates the active extension list used for crash reporting.
   void UpdateActiveExtensionsInCrashReporter();
 
@@ skipping 162 matching lines @@
 
   // A map of all external extension providers.
   typedef std::map<Extension::Location,
                    linked_ptr<ExternalExtensionProvider> > ProviderMap;
   ProviderMap external_extension_providers_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionsServiceBackend);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSIONS_SERVICE_H_