Revert 281130 "Replace "external_install" boolean parameter with..."

trunk/src/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>
@@ skipping 137 matching lines @@
 };
 
 // Manages installed and running Chromium extensions. An instance is shared
 // between normal and incognito profiles.
 class ExtensionService
     : public ExtensionServiceInterface,
       public extensions::ExternalProviderInterface::VisitorInterface,
       public content::NotificationObserver,
       public extensions::Blacklist::Observer {
  public:
-  enum UninstallReason {
-    UNINSTALL_REASON_FOR_TESTING,          // Used for testing code only
-    UNINSTALL_REASON_USER_INITIATED,       // User performed some UI gesture
-    UNINSTALL_REASON_EXTENSION_DISABLED,   // Extension disabled due to error
-    UNINSTALL_REASON_INTERNAL_MANAGEMENT,  // Internal extensions (see usages)
-    UNINSTALL_REASON_STORAGE_THRESHOLD_EXCEEDED,
-    UNINSTALL_REASON_EXTERNAL_INSTALL_CANCELED,
-    UNINSTALL_REASON_MANAGEMENT_API,
-    UNINSTALL_REASON_SYNC,
-    UNINSTALL_REASON_ORPHANED_SHARED_MODULE,
-    UNINSTALL_REASON_ORPHANED_THEME,
-    UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION,
-    UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION
-  };
-
   // Attempts to uninstall an extension from a given ExtensionService. Returns
   // true iff the target extension exists.
   static bool UninstallExtensionHelper(ExtensionService* extensions_service,
-                                       const std::string& extension_id,
-                                       UninstallReason reason);
+                                       const std::string& extension_id);
 
   // Constructor stores pointers to |profile| and |extension_prefs| but
   // ownership remains at caller.
   ExtensionService(Profile* profile,
                    const base::CommandLine* command_line,
                    const base::FilePath& install_directory,
                    extensions::ExtensionPrefs* extension_prefs,
                    extensions::Blacklist* blacklist,
                    bool autoupdate_enabled,
                    bool extensions_enabled,
@@ skipping 61 matching lines @@
   void Init();
 
   // Called when the associated Profile is going to be destroyed.
   void Shutdown();
 
   // Reloads the specified extension, sending the onLaunched() event to it if it
   // currently has any window showing.
   void ReloadExtension(const std::string& extension_id);
 
   // Uninstalls the specified extension. Callers should only call this method
-  // with extensions that exist. |reason| lets the caller specify why the
-  // extension is uninstalled.
+  // 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.
   virtual bool UninstallExtension(const std::string& extension_id,
-                                  UninstallReason reason,
+                                  bool external_uninstall,
                                   base::string16* error);
 
   // Enables the extension.  If the extension is already enabled, does
   // nothing.
   virtual void EnableExtension(const std::string& extension_id);
 
   // Disables the extension.  If the extension is already disabled, or
   // cannot be disabled, does nothing.
   virtual void DisableExtension(
       const std::string& extension_id,
@@ skipping 442 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_