Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc |
=================================================================== |
--- chrome/browser/ui/content_settings/content_setting_bubble_model.cc (revision 188726) |
+++ chrome/browser/ui/content_settings/content_setting_bubble_model.cc (working copy) |
@@ -277,14 +277,19 @@ |
{CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_UNBLOCK}, |
}; |
static const ContentSettingsTypeIdEntry kAllowedAllowIDs[] = { |
+ // TODO(bauerb): The string shouldn't be "unblock" (they weren't blocked). |
+ {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK}, |
{CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_NO_ACTION}, |
}; |
std::string radio_allow_label; |
if (allowed) { |
- radio_allow_label = l10n_util::GetStringUTF8( |
- GetIdForContentType(kAllowedAllowIDs, arraysize(kAllowedAllowIDs), |
- content_type())); |
+ int resource_id = GetIdForContentType(kAllowedAllowIDs, |
+ arraysize(kAllowedAllowIDs), |
+ content_type()); |
+ radio_allow_label = (content_type() == CONTENT_SETTINGS_TYPE_COOKIES) ? |
+ l10n_util::GetStringFUTF8(resource_id, display_host) : |
+ l10n_util::GetStringUTF8(resource_id); |
} else if (resources.empty()) { |
radio_allow_label = l10n_util::GetStringFUTF8( |
GetIdForContentType(kBlockedAllowIDs, arraysize(kBlockedAllowIDs), |
@@ -307,15 +312,19 @@ |
{CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_NO_ACTION}, |
}; |
static const ContentSettingsTypeIdEntry kAllowedBlockIDs[] = { |
+ // TODO(bauerb): The string should say "block". |
+ {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION}, |
{CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_BLOCK}, |
}; |
std::string radio_block_label; |
if (allowed) { |
- radio_block_label = l10n_util::GetStringFUTF8( |
- GetIdForContentType(kAllowedBlockIDs, arraysize(kAllowedBlockIDs), |
- content_type()), |
- display_host); |
+ int resource_id = GetIdForContentType(kAllowedBlockIDs, |
+ arraysize(kAllowedBlockIDs), |
+ content_type()); |
+ radio_block_label = (content_type() == CONTENT_SETTINGS_TYPE_COOKIES) ? |
+ l10n_util::GetStringUTF8(resource_id) : |
+ l10n_util::GetStringFUTF8(resource_id, display_host); |
} else { |
radio_block_label = l10n_util::GetStringUTF8( |
GetIdForContentType(kBlockedBlockIDs, arraysize(kBlockedBlockIDs), |