chrome/browser/ui/website_settings/permission_menu_model.cc - Issue 242443005: Changes cocoa implementation of permission bubble to better match mocks.

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/website_settings/permission_menu_model.cc

Issue 242443005: Changes cocoa implementation of permission bubble to better match mocks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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/browser/ui/cocoa/website_settings/permission_selector_button.mm ('K') | « chrome/browser/ui/cocoa/website_settings/permission_selector_button.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3532fe9dde4dbe975f10a2fa4974d2decc6ce507..9ffe283ed8dc0296b8bc0dcf55ac48bbe3d6ccbc 100644

--- a/chrome/browser/ui/website_settings/permission_menu_model.cc

+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc

@@ -58,9 +58,9 @@ PermissionMenuModel::PermissionMenuModel(const GURL& url,

permission_.setting = setting;

permission_.default_setting = CONTENT_SETTING_NUM_SETTINGS;

AddCheckItem(CONTENT_SETTING_ALLOW,

- l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW));

+ l10n_util::GetStringUTF16(IDS_PERMISSION_ALLOW));

Greg Billock 2014/04/18 17:17:02 This looks good. I'd set them to the page info con

leng 2014/04/18 17:21:35 Yes, I agree. When we redo the page-info bubble,

AddCheckItem(CONTENT_SETTING_BLOCK,

- l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK));

+ l10n_util::GetStringUTF16(IDS_PERMISSION_DENY));

}

PermissionMenuModel::~PermissionMenuModel() {}