summaryrefslogtreecommitdiffstats
path: root/chrome/browser/host_content_settings_map.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-07 05:15:20 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-07 05:15:20 +0000
commit2ccb70ec0356cb9257ce62958e37ec19c1b7c32c (patch)
treea9158aa6538e3a8a0fedcc8b2467dd978c9a08fa /chrome/browser/host_content_settings_map.cc
parent38884788d62f3706c0ee47e38db9af1b6ee988a1 (diff)
downloadchromium_src-2ccb70ec0356cb9257ce62958e37ec19c1b7c32c.zip
chromium_src-2ccb70ec0356cb9257ce62958e37ec19c1b7c32c.tar.gz
chromium_src-2ccb70ec0356cb9257ce62958e37ec19c1b7c32c.tar.bz2
Revert 58663 - Revert 58641 - Add user metrics for nonsandboxed plugin infobar.
BUG=52341 TEST=none Review URL: http://codereview.chromium.org/3303003 TBR=bauerb@chromium.org Review URL: http://codereview.chromium.org/3300015 TBR=mal@chromium.org Review URL: http://codereview.chromium.org/3303011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/host_content_settings_map.cc')
-rw-r--r--chrome/browser/host_content_settings_map.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc
index 8cb31f6..9c01798 100644
--- a/chrome/browser/host_content_settings_map.cc
+++ b/chrome/browser/host_content_settings_map.cc
@@ -8,6 +8,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/prefs/scoped_pref_update.h"
@@ -701,11 +702,17 @@ void HostContentSettingsMap::SetBlockNonsandboxedPlugins(bool block) {
block_nonsandboxed_plugins_ = block;
}
+
PrefService* prefs = profile_->GetPrefs();
- if (block)
+ if (block) {
+ UserMetrics::RecordAction(
+ UserMetricsAction("BlockNonsandboxedPlugins_Enable"));
prefs->SetBoolean(prefs::kBlockNonsandboxedPlugins, true);
- else
+ } else {
+ UserMetrics::RecordAction(
+ UserMetricsAction("BlockNonsandboxedPlugins_Disable"));
prefs->ClearPref(prefs::kBlockNonsandboxedPlugins);
+ }
}
void HostContentSettingsMap::ResetToDefaults() {