Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3794)

Unified Diff: chrome/browser/ui/website_settings/permission_menu_model.cc

Issue 916073004: Plugin Power Saver: Migrate ASK to BLOCK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 b8f68053727563c46cff0c1fa0b810be9fb56860..7c6b450fc8bfb288405ddd78d6781be5c7c7b0d9 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.cc
+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc
@@ -24,11 +24,10 @@ PermissionMenuModel::PermissionMenuModel(
IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK);
break;
case CONTENT_SETTING_ASK:
- // For Plugins, ASK is obsolete. Show as DETECT to reflect actual
- // behavior.
+ // For Plugins, ASK is obsolete. Show as BLOCK to reflect actual behavior.
label = l10n_util::GetStringUTF16(
permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS
- ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_DETECT_IMPORTANT_CONTENT
+ ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK
: IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
break;
case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
@@ -80,10 +79,10 @@ PermissionMenuModel::PermissionMenuModel(const GURL& url,
PermissionMenuModel::~PermissionMenuModel() {}
bool PermissionMenuModel::IsCommandIdChecked(int command_id) const {
- // For Plugins, ASK is obsolete. Show as DETECT to reflect actual behavior.
+ // For Plugins, ASK is obsolete. Show as BLOCK to reflect actual behavior.
if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS &&
permission_.setting == CONTENT_SETTING_ASK &&
- command_id == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {
+ command_id == CONTENT_SETTING_BLOCK) {
return true;
}
return permission_.setting == command_id;
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698