| Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| index 5ae6f1b53d2ab804d02f695b7f6e126b102c66e7..93126f4a2f97f0be7cd3ced40e1ef1ed263e3b5a 100644
|
| --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
|
|
|
| #include "base/command_line.h"
|
| +#include "base/metrics/histogram.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| @@ -964,11 +965,16 @@ ContentSettingMixedScriptBubbleModel::ContentSettingMixedScriptBubbleModel(
|
| : ContentSettingTitleLinkAndCustomModel(
|
| delegate, web_contents, profile, content_type) {
|
| DCHECK_EQ(content_type, CONTENT_SETTINGS_TYPE_MIXEDSCRIPT);
|
| + UMA_HISTOGRAM_ENUMERATION("ContentSettings.MixedScript",
|
| + TabSpecificContentSettings::MIXEDSCRIPT_DISPLAYED_BUBBLE,
|
| + TabSpecificContentSettings::MIXEDSCRIPT_CONTENT_NUM_EVENTS);
|
| set_custom_link_enabled(true);
|
| }
|
|
|
| void ContentSettingMixedScriptBubbleModel::OnCustomLinkClicked() {
|
| - content::RecordAction(UserMetricsAction("MixedScript_LoadAnyway_Bubble"));
|
| + UMA_HISTOGRAM_ENUMERATION("ContentSettings.MixedScript",
|
| + TabSpecificContentSettings::MIXEDSCRIPT_CLICKED_ALLOW,
|
| + TabSpecificContentSettings::MIXEDSCRIPT_CONTENT_NUM_EVENTS);
|
| DCHECK(web_contents());
|
| web_contents()->SendToAllFrames(
|
| new ChromeViewMsg_SetAllowRunningInsecureContent(MSG_ROUTING_NONE, true));
|
|
|