| 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 71456636005ce55c5707f83424eab540a0074a89..7c6b450fc8bfb288405ddd78d6781be5c7c7b0d9 100644
|
| --- a/chrome/browser/ui/website_settings/permission_menu_model.cc
|
| +++ b/chrome/browser/ui/website_settings/permission_menu_model.cc
|
| @@ -24,8 +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.
|
| label = l10n_util::GetStringUTF16(
|
| - IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
|
| + permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS
|
| + ? IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_BLOCK
|
| + : IDS_WEBSITE_SETTINGS_MENU_ITEM_DEFAULT_ASK);
|
| break;
|
| case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
|
| label = l10n_util::GetStringUTF16(
|
| @@ -48,8 +51,8 @@ PermissionMenuModel::PermissionMenuModel(
|
|
|
| if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS) {
|
| label = l10n_util::GetStringUTF16(
|
| - IDS_WEBSITE_SETTINGS_MENU_ITEM_ASK);
|
| - AddCheckItem(CONTENT_SETTING_ASK, label);
|
| + IDS_WEBSITE_SETTINGS_MENU_ITEM_DETECT_IMPORTANT_CONTENT);
|
| + AddCheckItem(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, label);
|
| }
|
|
|
| if (permission_.type != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
|
| @@ -76,6 +79,12 @@ 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.
|
| + if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS &&
|
| + permission_.setting == CONTENT_SETTING_ASK &&
|
| + command_id == CONTENT_SETTING_BLOCK) {
|
| + return true;
|
| + }
|
| return permission_.setting == command_id;
|
| }
|
|
|
|
|