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

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

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

index 7c6b450fc8bfb288405ddd78d6781be5c7c7b0d9..b8f68053727563c46cff0c1fa0b810be9fb56860 100644

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

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

@@ -24,10 +24,11 @@ PermissionMenuModel::PermissionMenuModel(

IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);

break;

case CONTENT_SETTING_ASK:

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

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

+ // behavior.

label = l10n_util::GetStringUTF16(

permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS

- ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK

+ ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT

: IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);

break;

case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:

@@ -79,10 +80,10 @@ PermissionMenuModel::PermissionMenuModel(const GURL& url,

PermissionMenuModel::~PermissionMenuModel() {}

bool PermissionMenuModel::IsCommandIdChecked(int command_id) const {

- // 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 (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS &&

permission_.setting == CONTENT_SETTING_ASK &&

- command_id == CONTENT_SETTING_BLOCK) {

+ command_id == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {

return true;

}

return permission_.setting == command_id;