chrome/renderer/content_settings_observer.cc - Issue 777103002: Add the names of plugins to the blocked plugin bubble.

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/renderer/content_settings_observer.cc

Issue 777103002: Add the names of plugins to the blocked plugin bubble. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make mergeable by reusing an existing string with existing translation Created 6 years 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/ui/content_settings/content_setting_bubble_model.cc ('K') | « chrome/renderer/content_settings_observer.h ('k') | chrome/renderer/content_settings_observer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/content_settings_observer.cc

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc

index 7c282fbd443324f6d202ca3eb19bded649931cdf..610a04a0e7c7864d93c18fb933a9a245256b12b8 100644

--- a/chrome/renderer/content_settings_observer.cc

+++ b/chrome/renderer/content_settings_observer.cc

@@ -202,7 +202,18 @@ void ContentSettingsObserver::DidBlockContentType(

ContentSettingsType settings_type) {

if (!content_blocked_[settings_type]) {

content_blocked_[settings_type] = true;

- Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type));

+ Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type,

+ base::string16()));

+ }

+void ContentSettingsObserver::DidBlockContentType(

+ ContentSettingsType settings_type,

+ const base::string16& details) {

+ if (!content_blocked_[settings_type]) {

+ content_blocked_[settings_type] = true;

+ Send(new ChromeViewHostMsg_ContentBlocked(routing_id(), settings_type,

+ details));

}