chrome/browser/plugins/plugin_info_message_filter.cc - Issue 902223002: Plugin Power Saver: Remove ASK (left C2P). Replace with DETECT.

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/plugins/plugin_info_message_filter.cc

Issue 902223002: Plugin Power Saver: Remove ASK (left C2P). Replace with DETECT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 10 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

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/plugins/plugin_info_message_filter.cc

diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc

index 301d2952d6775db9bf316753e0088ff97b5387e7..d60f53b3e2fbe07f7487f67d4a5202ea9400cd7b 100644

--- a/chrome/browser/plugins/plugin_info_message_filter.cc

+++ b/chrome/browser/plugins/plugin_info_message_filter.cc

@@ -415,11 +415,10 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(

}

#endif // defined(ENABLE_EXTENSIONS)

- if (plugin_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {

+ if (plugin_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT ||

+ plugin_setting == CONTENT_SETTING_ASK) {

status->value =

ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent;

- } else if (plugin_setting == CONTENT_SETTING_ASK) {

- status->value = ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay;

} else if (plugin_setting == CONTENT_SETTING_BLOCK) {

status->value =

is_managed ? ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy

@@ -549,7 +548,6 @@ void PluginInfoMessageFilter::Context::MaybeGrantAccess(

const ChromeViewHostMsg_GetPluginInfo_Status& status,

const base::FilePath& path) const {

if (status.value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed ||

- status.value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay ||

status.value ==

ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent) {

ChromePluginServiceFilter::GetInstance()->AuthorizePlugin(