chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 1150343004: Changing string id for CONTENT_SETTINGS_TYPE_COOKIES for block and allow case.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 1150343004: Changing string id for CONTENT_SETTINGS_TYPE_COOKIES for block and allow case. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changing test cases as per new strings Created 5 years, 6 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

« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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},

};