summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation/testing_automation_provider.cc
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 22:57:58 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-10 22:57:58 +0000
commit612b75f563f62ec199673cfc2dcb17b1610603ac (patch)
tree70053764657d5573dc546d4fed3bf352f59d5015 /chrome/browser/automation/testing_automation_provider.cc
parentdff69fd38aa755ecd8ddd9348fbade0827d780ad (diff)
downloadchromium_src-612b75f563f62ec199673cfc2dcb17b1610603ac.zip
chromium_src-612b75f563f62ec199673cfc2dcb17b1610603ac.tar.gz
chromium_src-612b75f563f62ec199673cfc2dcb17b1610603ac.tar.bz2
Add a preference for why an extension is disabled.
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/testing_automation_provider.cc')
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 64625e2..843be92 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -4662,7 +4662,7 @@ void TestingAutomationProvider::SetExtensionStateById(
AutomationJSONReply(this, reply_message).SendSuccess(NULL);
}
} else {
- service->DisableExtension(extension->id());
+ service->DisableExtension(extension->id(), Extension::DISABLE_USER_ACTION);
AutomationJSONReply(this, reply_message).SendSuccess(NULL);
}