| 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;
|
|
|