Index: chrome/browser/extensions/api/permissions/permissions_api_helpers.cc |
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc |
index 620c8c5f6b5f872dcd237592027cf6265e1051fd..162ab6ceac10ae59120a548f284c72f13b749adb 100644 |
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc |
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc |
@@ -56,6 +56,8 @@ scoped_ptr<Permissions> PackPermissionSet(const PermissionSet* set) { |
} |
} |
+ // TODO(rpaquay): Deal with ManifestPermissionSet |
+ |
permissions->origins.reset(new std::vector<std::string>()); |
URLPatternSet hosts = set->explicit_hosts(); |
for (URLPatternSet::const_iterator i = hosts.begin(); i != hosts.end(); ++i) |
@@ -121,6 +123,9 @@ scoped_refptr<PermissionSet> UnpackPermissionSet( |
} |
} |
+ // TODO(rpaquay): Deal with ManifestPermissionSet |
+ ManifestPermissionSet manifest_permissions; |
+ |
URLPatternSet origins; |
if (permissions.origins.get()) { |
for (std::vector<std::string>::iterator it = permissions.origins->begin(); |
@@ -142,7 +147,7 @@ scoped_refptr<PermissionSet> UnpackPermissionSet( |
} |
return scoped_refptr<PermissionSet>( |
- new PermissionSet(apis, origins, URLPatternSet())); |
+ new PermissionSet(apis, manifest_permissions, origins, URLPatternSet())); |
} |
} // namespace permissions_api_helpers |