chrome/browser/ui/website_settings/website_settings_ui.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/ui/website_settings/website_settings_ui.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/ui/website_settings/permission_menu_model.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings_ui.cc

diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc

index e830eca5e5d2effc4b48a0d3ea3158a4313eecad..5290c31172ac2a58a21096af0ea1aaf0928bd7cb 100644

--- a/chrome/browser/ui/website_settings/website_settings_ui.cc

+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc

@@ -169,10 +169,10 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(

if (effective_setting == CONTENT_SETTING_DEFAULT) {

effective_setting = default_setting;

- // For Plugins, ASK is obsolete. Show as BLOCK to reflect actual behavior.

+ // For Plugins, ASK is obsolete. Show as DETECT to reflect actual behavior.

if (type == CONTENT_SETTINGS_TYPE_PLUGINS &&

default_setting == CONTENT_SETTING_ASK) {

- effective_setting = CONTENT_SETTING_BLOCK;

+ effective_setting = CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;

}