chrome/browser/automation/testing_automation_provider.cc - Issue 7003098: Start refractoring extension permissions into ExtensionPermissionSet.

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/automation/testing_automation_provider.cc

Issue 7003098: Start refractoring extension permissions into ExtensionPermissionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix a bad merge Created 9 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:

Index: chrome/browser/automation/testing_automation_provider.cc

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc

index 9c2db89060dcd72726ff43a9020e613fa2a32cd5..5b791b6fca2c36f250f3299ffdf5ca7f4c6ba8b1 100644

--- a/chrome/browser/automation/testing_automation_provider.cc

+++ b/chrome/browser/automation/testing_automation_provider.cc

@@ -4012,7 +4012,7 @@ ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) {

ListValue* GetAPIPermissions(const Extension* ext) {

ListValue* permissions = new ListValue;

- std::set<std::string> perm_list = ext->api_permissions();

+ std::set<std::string> perm_list = ext->permission_set().GetAPIsAsStrings();

for (std::set<std::string>::const_iterator perm = perm_list.begin();

perm != perm_list.end(); ++perm) {

permissions->Append(new StringValue(perm->c_str()));