chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 2048303002: Fix broken mixed script Rappor metric and add browser test

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 2048303002: Fix broken mixed script Rappor metric and add browser test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make BlockAllContentForTesting() uphold the details-is-a-valid-GURL contract Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | chrome/renderer/content_settings_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 525410cd7ac64bbe61a81541991868d353fb70cb..2ff775c4f6ed8c1f39a462bf0c3a93233f961518 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -10,6 +10,7 @@

#include "base/macros.h"

#include "base/stl_util.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/content_settings/chrome_content_settings_utils.h"

#include "chrome/browser/content_settings/cookie_settings_factory.h"

@@ -985,6 +986,7 @@ void ContentSettingMixedScriptBubbleModel::OnCustomLinkClicked() {

content_settings::RecordMixedScriptAction(

content_settings::MIXED_SCRIPT_ACTION_CLICKED_ALLOW);

content_settings::RecordMixedScriptActionWithRAPPOR(

+ g_browser_process->rappor_service(),

content_settings::MIXED_SCRIPT_ACTION_CLICKED_ALLOW,

web_contents()->GetLastCommittedURL());

}