summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 22:37:57 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 22:37:57 +0000
commitc0231d7e9bb5cee2f41305fd0b7b5fcea49bfd18 (patch)
tree7c74099b8f36b244f100e2dc4f3221fd557e9b1c
parentb63d58da1f8c624c7da6cf2d0b057b20924aa737 (diff)
downloadchromium_src-c0231d7e9bb5cee2f41305fd0b7b5fcea49bfd18.zip
chromium_src-c0231d7e9bb5cee2f41305fd0b7b5fcea49bfd18.tar.gz
chromium_src-c0231d7e9bb5cee2f41305fd0b7b5fcea49bfd18.tar.bz2
Fix the sideload wipeout re-enable metric.
The 'extension disabled' metric is showing up but the 'extension re-enabled' metric is not (because we clear the disable reasons earlier in the function). BUG=154624 TEST=None (I'll know it is working when the new enum shows up on the dashboard). Review URL: https://chromiumcodereview.appspot.com/11414164 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169514 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 9de535a..af397ea7 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -909,6 +909,7 @@ void ExtensionService::EnableExtension(const std::string& extension_id) {
if (IsExtensionEnabled(extension_id))
return;
+ int disable_reasons = extension_prefs_->GetDisableReasons(extension_id);
extension_prefs_->SetExtensionState(extension_id, Extension::ENABLED);
extension_prefs_->ClearDisableReasons(extension_id);
@@ -926,8 +927,7 @@ void ExtensionService::EnableExtension(const std::string& extension_id) {
AcknowledgeExternalExtension(extension->id());
}
- if (extension_prefs_->GetDisableReasons(extension->id()) &
- Extension::DISABLE_SIDELOAD_WIPEOUT)
+ if (disable_reasons & Extension::DISABLE_SIDELOAD_WIPEOUT)
UMA_HISTOGRAM_BOOLEAN("DisabledExtension.ExtensionWipedStatus", false);
// Move it over to the enabled list.