| Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| index 9c169727b84b944a8539f4175df7c7416704e5e8..c6a7c94b306381091f65f29576ed9e811d62a842 100644
|
| --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
|
| @@ -300,8 +300,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
|
| };
|
| // Fields as for kBlockedAllowIDs, above.
|
| 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_COOKIES, IDS_ALLOWED_COOKIES_NO_ACTION},
|
| {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_NO_ACTION},
|
| {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_ALLOWED_DOWNLOAD_NO_ACTION},
|
| };
|
| @@ -331,8 +330,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
|
| {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_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_COOKIES, IDS_ALLOWED_COOKIES_BLOCK},
|
| {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_BLOCK},
|
| {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_ALLOWED_DOWNLOAD_BLOCK},
|
| };
|
|
|