Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4221)

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: See if rebasing fixes the tests... 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:
View side-by-side diff with in-line comments
Download patch
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 5fe221855b84e2132d908f247ae6b155827821e1..b7b83add0c908e9b4b0f90e3cb6109c7fb3aea89 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -4015,7 +4015,7 @@ ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) {
if (effective_perm)
pattern_list = ext->GetEffectiveHostPermissions().patterns();
else
- pattern_list = ext->host_permissions();
+ pattern_list = ext->permission_set()->explicit_hosts().patterns();
ListValue* permissions = new ListValue;
for (URLPatternList::const_iterator perm = pattern_list.begin();
@@ -4028,7 +4028,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()));
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/background/background_application_list_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698