chrome/renderer/chrome_content_renderer_client.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/chrome_content_renderer_client.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/common/render_messages.h ('k') | chrome/renderer/content_settings_observer.h » ('j') | chrome/renderer/content_settings_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_content_renderer_client.cc

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

index 62fc9409f759fbef9be22531dc946884bf407b15..434fe95be0a39ebf107c7c38b6d775c961d19e5b 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -877,7 +877,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

identifier));

} else {

// Send IPC for showing blocked plugins page action.

- observer->DidBlockContentType(content_type);

+ observer->DidBlockContentType(content_type, plugin.name);

}

break;

}

@@ -888,7 +888,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

placeholder->set_allow_loading(true);

RenderThread::Get()->RecordAction(

UserMetricsAction("Plugin_ClickToPlay"));

- observer->DidBlockContentType(content_type);

+ observer->DidBlockContentType(content_type, plugin.name);

break;

}

case ChromeViewHostMsg_GetPluginInfo_Status::kBlocked: {

@@ -897,7 +897,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name), GURL());

placeholder->set_allow_loading(true);

RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));

- observer->DidBlockContentType(content_type);

+ observer->DidBlockContentType(content_type, plugin.name);

break;

}

case ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy: {

@@ -907,7 +907,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

placeholder->set_allow_loading(false);

RenderThread::Get()->RecordAction(

UserMetricsAction("Plugin_BlockedByPolicy"));

- observer->DidBlockContentType(content_type);

+ observer->DidBlockContentType(content_type, plugin.name);

break;

}