diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 20:00:06 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 20:00:06 +0000 |
| commit | d4efb2e57d0f5498a1171744b31d6300d6bf9b55 (patch) | |
| tree | 0b8f7db19af5f37ba9d3e467be2db99e72aa295d /chrome/common | |
| parent | 07092e70b19facd29fd1c22986b2f3ad1d6646fe (diff) | |
| download | chromium_src-d4efb2e57d0f5498a1171744b31d6300d6bf9b55.zip chromium_src-d4efb2e57d0f5498a1171744b31d6300d6bf9b55.tar.gz chromium_src-d4efb2e57d0f5498a1171744b31d6300d6bf9b55.tar.bz2 | |
Revert 60834 - Changed EXTENSION_UNINSTALLED notification to happen after uninstallation.
The important part is that it comes after the EXTENSION_UNLOADED
notification is sent. This makes it easier on the listeners, as they
can assume that extension notifications other than EXTENSION_UNINSTALLED
are sent for currently-installed extensions.
BUG=54415
TEST=BackgroundModeManagerTest
Review URL: http://codereview.chromium.org/3461025
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/3525001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/extension.cc | 5 | ||||
| -rw-r--r-- | chrome/common/extensions/extension.h | 9 | ||||
| -rw-r--r-- | chrome/common/notification_type.h | 7 |
3 files changed, 5 insertions, 16 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 375bfa6..a236809 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -1958,8 +1958,3 @@ ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest, ExtensionInfo::~ExtensionInfo() { } - -UninstalledExtensionInfo::UninstalledExtensionInfo( - const Extension& extension) - : extension_id(extension.id()), - extension_api_permissions(extension.api_permissions()) {} diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 4ea052a..79f9156 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -610,13 +610,4 @@ struct ExtensionInfo { DISALLOW_COPY_AND_ASSIGN(ExtensionInfo); }; -// Struct used for the details of the EXTENSION_UNINSTALLED -// notification. -struct UninstalledExtensionInfo { - explicit UninstalledExtensionInfo(const Extension& extension); - - std::string extension_id; - std::vector<std::string> extension_api_permissions; -}; - #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h index d903ffb..541aaa9 100644 --- a/chrome/common/notification_type.h +++ b/chrome/common/notification_type.h @@ -797,8 +797,11 @@ class NotificationType { // details about why the install failed. EXTENSION_INSTALL_ERROR, - // Sent when an extension has been uninstalled. The details are - // an UninstalledExtensionInfo struct and the source is a Profile. + // Sent when a new extension is being uninstalled. When this notification + // is sent, the ExtensionsService still is tracking this extension (it has + // not been unloaded yet). This will be followed by an EXTENSION_UNLOADED + // or EXTENSION_UNLOADED_DISABLED when the extension is actually unloaded. + // The details are an Extension and the source is a Profile. EXTENSION_UNINSTALLED, // Sent when an extension is unloaded. This happens when an extension is |