Cleanup: Make ExtensionService::OnExtensionInstalled take a bitmask instead of

chrome/browser/extensions/extension_service.h

 // Copyright (c) 2012 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_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/external_provider_interface.h"
+#include "extensions/browser/install_flag.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #include "sync/api/string_ordinal.h"
 
 class ExtensionSyncService;
 class GURL;
 class Profile;
@@ skipping 239 matching lines @@
   void GrantPermissions(const extensions::Extension* extension);
 
   // Check for updates (or potentially new extensions from external providers)
   void CheckForExternalUpdates();
 
   // Called when the initial extensions load has completed.
   virtual void OnLoadedInstalledExtensions();
 
   // Informs the service that an extension's files are in place for loading.
   //
-  // |page_ordinal| is the location of the extension in the app launcher.
-  // |has_requirement_errors| is true if requirements of the extension weren't
-  // met (for example graphics capabilities).
-  // |blacklist_state| will be BLACKLISTED if the extension is blacklisted.
-  // |wait_for_idle| may be false to install the extension immediately.
+  // |extension|     the extension
+  // |page_ordinal|  the location of the extension in the app launcher
+  // |install_flags| a bitmask of extensions::InstallFlags
   void OnExtensionInstalled(const extensions::Extension* extension,
                             const syncer::StringOrdinal& page_ordinal,
-                            bool has_requirement_errors,
-                            extensions::BlacklistState blacklist_state,
-                            bool is_ephemeral,
-                            bool wait_for_idle);
+                            int install_flags);
+  void OnExtensionInstalled(const extensions::Extension* extension,
+                            const syncer::StringOrdinal& page_ordinal) {
+    OnExtensionInstalled(extension,
+                         page_ordinal,
+                         static_cast<int>(extensions::kInstallFlagNone));
+  }
 
   // Checks for delayed installation for all pending installs.
   void MaybeFinishDelayedInstallations();
 
   // Promotes an ephemeral app to a regular installed app. Ephemeral apps
   // are already installed in extension system (albiet transiently) and only
   // need to be exposed in the UI. Set |is_from_sync| to true if the
   // install was initiated via sync.
   void PromoteEphemeralApp(
       const extensions::Extension* extension, bool is_from_sync);
@@ skipping 171 matching lines @@
   void TrackTerminatedExtension(const extensions::Extension* extension);
 
   // Removes the extension with the given id from the list of
   // terminated extensions if it is there.
   void UntrackTerminatedExtension(const std::string& id);
 
   // Update preferences for a new or updated extension; notify observers that
   // the extension is installed, e.g., to update event handlers on background
   // pages; and perform other extension install tasks before calling
   // AddExtension.
+  // |install_flags| is a bitmask of extensions::InstallFlags.
   void AddNewOrUpdatedExtension(const extensions::Extension* extension,
                                 extensions::Extension::State initial_state,
-                                extensions::BlacklistState blacklist_state,
-                                bool is_ephemeral,
+                                int install_flags,
                                 const syncer::StringOrdinal& page_ordinal,
                                 const std::string& install_parameter);
 
   // Handles sending notification that |extension| was loaded.
   void NotifyExtensionLoaded(const extensions::Extension* extension);
 
   // Handles sending notification that |extension| was unloaded.
   void NotifyExtensionUnloaded(
       const extensions::Extension* extension,
       extensions::UnloadedExtensionInfo::Reason reason);
@@ skipping 16 matching lines @@
   // Helper that updates the active extension list used for crash reporting.
   void UpdateActiveExtensionsInCrashReporter();
 
   // Helper to determine whether we should initially enable an installed
   // (or upgraded) extension.
   bool ShouldEnableOnInstall(const extensions::Extension* extension);
 
   // Helper to determine if updating an extensions should proceed immediately,
   // or if we should delay the update until further notice.
   bool ShouldDelayExtensionUpdate(const std::string& extension_id,
-                                  bool wait_for_idle) const;
+                                  bool install_immediately) const;
 
   // Manages the blacklisted extensions, intended as callback from
   // Blacklist::GetBlacklistedIDs.
   void ManageBlacklist(
       const extensions::Blacklist::BlacklistStateMap& blacklisted_ids);
 
   // Add extensions in |blocked| to blacklisted_extensions, remove extensions
   // that are neither in |blocked|, nor in |unchanged|.
   void UpdateBlockedExtensions(const extensions::ExtensionIdSet& blocked,
                                const extensions::ExtensionIdSet& unchanged);
@@ skipping 169 matching lines @@
                            GreylistedExtensionDisabled);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            GreylistDontEnableManuallyDisabled);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            GreylistUnknownDontChange);
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_