Index: chrome/browser/content_settings/tab_specific_content_settings.cc |
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc |
index d52e41d19b0c58e9e29c09dab70820ce11dffb55..c25e6b6ba8cba8494329d574f7c0af16b6ee7dc7 100644 |
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc |
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc |
@@ -8,6 +8,7 @@ |
#include "base/command_line.h" |
#include "base/lazy_instance.h" |
+#include "base/metrics/histogram.h" |
#include "base/prefs/pref_service.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" |
@@ -63,6 +64,13 @@ STATIC_CONST_MEMBER_DEFINITION const |
TabSpecificContentSettings::MicrophoneCameraState |
TabSpecificContentSettings::CAMERA_BLOCKED; |
+ |
+void TabSpecificContentSettings::RecordMixedScriptAction(int action) { |
+ UMA_HISTOGRAM_ENUMERATION("ContentSettings.MixedScript", |
+ action, |
+ MIXEDSCRIPT_NUM_ACTIONS); |
+} |
+ |
TabSpecificContentSettings::SiteDataObserver::SiteDataObserver( |
TabSpecificContentSettings* tab_specific_content_settings) |
: tab_specific_content_settings_(tab_specific_content_settings) { |
@@ -324,6 +332,10 @@ void TabSpecificContentSettings::OnContentBlocked(ContentSettingsType type) { |
chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED, |
content::Source<WebContents>(web_contents()), |
content::NotificationService::NoDetails()); |
+ |
+ if (type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) { |
+ RecordMixedScriptAction(MIXEDSCRIPT_DISPLAYED_SHIELD); |
+ } |
} |
} |