extensions/browser/api/management/management_api.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: extensions/browser/api/management/management_api.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: review (the easy parts) 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

« no previous file with comments | « chrome/test/data/extensions/api_test/management/test/basics.js ('k') | extensions/common/permissions/permission_message_test_util.h » ('j') | extensions/common/permissions/permissions_data.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/management/management_api.cc

diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc

index c2fb30d84ef6d8359c8506334589d27400e57a6a..cdd7e4529c0c200ae7a1ca7d40f91e2dbd76fa61 100644

--- a/extensions/browser/api/management/management_api.cc

+++ b/extensions/browser/api/management/management_api.cc

@@ -61,12 +61,10 @@ AutoConfirmForTest auto_confirm_for_test = DO_NOT_SKIP;

std::vector<std::string> CreateWarningsList(const Extension* extension) {

std::vector<std::string> warnings_list;

- PermissionMessages warnings =

- extension->permissions_data()->GetPermissionMessages();

- for (PermissionMessages::const_iterator iter = warnings.begin();

- iter != warnings.end(); ++iter) {

- warnings_list.push_back(base::UTF16ToUTF8(iter->message()));

- }

+ CoalescedPermissionMessages warnings =

+ extension->permissions_data()->GetCoalescedPermissionMessages();

+ for (const CoalescedPermissionMessage& message : warnings)

+ warnings_list.push_back(base::UTF16ToUTF8(message.message()));

return warnings_list;

}