Index: chrome/browser/extensions/extension_service.h |
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h |
index e1a0ebd9bfa8ae5b7552168643b67fe4a8513204..3612bc2760de6f1ee8ba131d449574cd66d170d7 100644 |
--- a/chrome/browser/extensions/extension_service.h |
+++ b/chrome/browser/extensions/extension_service.h |
@@ -155,28 +155,12 @@ class ExtensionService |
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_STORAGE_THRESHOLD_EXCEEDED, |
- UNINSTALL_REASON_INSTALL_CANCELED, |
- UNINSTALL_REASON_MANAGEMENT_API, |
- UNINSTALL_REASON_SYNC, |
- UNINSTALL_REASON_ORPHANED_THEME, |
- UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION, |
- // The entries below imply bypassing checking user has permission to |
- // uninstall the corresponding extension id. |
- UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION, |
- UNINSTALL_REASON_ORPHANED_SHARED_MODULE, |
- UNINSTALL_REASON_INTERNAL_MANAGEMENT // Internal extensions (see usages) |
- }; |
- |
// 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); |
+ static bool UninstallExtensionHelper( |
+ ExtensionService* extensions_service, |
+ const std::string& extension_id, |
+ extensions::UninstalledExtensionInfo::Reason reason); |
// Constructor stores pointers to |profile| and |extension_prefs| but |
// ownership remains at caller. |
@@ -260,9 +244,10 @@ class ExtensionService |
// Uninstalls the specified extension. Callers should only call this method |
// with extensions that exist. |reason| lets the caller specify why the |
// extension is uninstalled. |
- virtual bool UninstallExtension(const std::string& extension_id, |
- UninstallReason reason, |
- base::string16* error); |
+ virtual bool UninstallExtension( |
+ const std::string& extension_id, |
+ extensions::UninstalledExtensionInfo::Reason reason, |
+ base::string16* error); |
// Enables the extension. If the extension is already enabled, does |
// nothing. |