chrome/common/extensions/permissions/chrome_permission_message_rules.cc - Issue 980353003: Extensions: Switch to new permission message system, part I

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/common/extensions/permissions/chrome_permission_message_rules.cc

Issue 980353003: Extensions: Switch to new permission message system, part I (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cleanup;rebase Created 5 years, 9 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/common/extensions/permissions/chrome_permission_message_provider.cc ('K') | « chrome/common/extensions/permissions/chrome_permission_message_provider.cc ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | extensions/common/permissions/permission_message_test_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/chrome_permission_message_rules.cc

diff --git a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc

index 0c61bce993e37f0aaca129bf64ac7d6f45130267..a4a14997b5cbc4b8eef1f95becc98b912851c3f4 100644

--- a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc

+++ b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc

@@ -265,15 +265,15 @@ ChromePermissionMessageRule::GetAllRules() {

// Parameterized permission messages:

// Messages generated by the sockets permission.

{new SpaceSeparatedListFormatter(

- IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST,

- IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS),

- {APIPermission::kSocketSpecificHosts},

- {}},

- {new SpaceSeparatedListFormatter(

IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN,

Marc Treib 2015/03/09 14:08:02 Changed the order here because some tests in permi

IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS),

{APIPermission::kSocketDomainHosts},

{}},

+ {new SpaceSeparatedListFormatter(

+ IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST,

+ IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS),

+ {APIPermission::kSocketSpecificHosts},

+ {}},

// Messages generated by host permissions.

{new CommaSeparatedListFormatter(