chrome/browser/ui/website_settings/website_settings_ui.cc - Issue 790123003: Re-land: Fix Website Settings crash with Plugins ASK setting.

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/website_settings_ui.cc

Issue 790123003: Re-land: Fix Website Settings crash with Plugins ASK setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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

Index: chrome/browser/ui/website_settings/website_settings_ui.cc

diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc

index 05e7da8d119db2306cb992a6193524c5643f47e4..2591d6e16b072f33cf5f66ce917102f1f9c1f069 100644

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

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

@@ -21,7 +21,7 @@ const int kPermissionButtonTextIDPolicyManaged[] = {

kInvalidResourceID,

IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY,

IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY,

- kInvalidResourceID,

+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_POLICY,

kInvalidResourceID,

kInvalidResourceID};

static_assert(arraysize(kPermissionButtonTextIDPolicyManaged) ==

@@ -48,7 +48,7 @@ const int kPermissionButtonTextIDUserManaged[] = {

kInvalidResourceID,

IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER,

IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER,

- kInvalidResourceID,

+ IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_USER,

kInvalidResourceID,

kInvalidResourceID};

static_assert(arraysize(kPermissionButtonTextIDUserManaged) ==

« no previous file with comments | « chrome/browser/ui/website_settings/permission_menu_model.cc ('k') | no next file » | no next file with comments »