diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 23:52:02 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 23:52:02 +0000 |
| commit | 6de0b5a0775d6b22d2a65d258199e877916ff120 (patch) | |
| tree | 4474a1f805985c5f0fda142c61d0b7a497ad247f /chrome/browser/extensions/extension_service.h | |
| parent | 3e011d80be8aef1a3cc3779c3fe8f04a394f3aff (diff) | |
| download | chromium_src-6de0b5a0775d6b22d2a65d258199e877916ff120.zip chromium_src-6de0b5a0775d6b22d2a65d258199e877916ff120.tar.gz chromium_src-6de0b5a0775d6b22d2a65d258199e877916ff120.tar.bz2 | |
Revert 131665 - Add a preference for why an extension is disabled.
Broke linux browser_tests ExtensionManagementApiEscalationTest.DisabledReason,ReEnable
Don't show the permissions upgrade alert for extensions disabled by the user.
For existing disabled extensions, guess the disabling reason from whether they exceed their granted permissions.
BUG=121436
TEST=ExtensionDisabledGlobalErrorTest.*
TBR=csilv@chromium.org,jianli@chromium.org,mark@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10014005
TBR=yoz@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.h')
| -rw-r--r-- | chrome/browser/extensions/extension_service.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 14e7412..90a91cee 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -342,8 +342,7 @@ class ExtensionService // Disables the extension. If the extension is already disabled, or // cannot be disabled, does nothing. - virtual void DisableExtension(const std::string& extension_id, - Extension::DisableReason disable_reason); + virtual void DisableExtension(const std::string& extension_id); // Updates the |extension|'s granted permissions lists to include all // permissions in the |extension|'s manifest and re-enables the |