Index: chrome/renderer/extensions/dispatcher.cc |
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc |
index cb031c0f88bf04e100df9518b76ce91e4d0b74e9..b75be94d2832951c4da5c90a17d41e574ffbe2fc 100644 |
--- a/chrome/renderer/extensions/dispatcher.cc |
+++ b/chrome/renderer/extensions/dispatcher.cc |
@@ -1378,17 +1378,23 @@ void Dispatcher::AddOrRemoveBindings(const std::string& extension_id) { |
base::Unretained(this))); |
} |
-void Dispatcher::OnUpdatePermissions(int reason_id, |
- const std::string& extension_id, |
- const APIPermissionSet& apis, |
- const URLPatternSet& explicit_hosts, |
- const URLPatternSet& scriptable_hosts) { |
+void Dispatcher::OnUpdatePermissions( |
+ const ExtensionMsg_UpdatePermissions_Params& params) { |
+ int reason_id = params.reason_id; |
+ const std::string& extension_id = params.extension_id; |
+ const APIPermissionSet& apis = params.apis; |
+ const ManifestPermissionSet& manifest_permissions = |
+ params.manifest_permissions; |
+ const URLPatternSet& explicit_hosts = params.explicit_hosts; |
+ const URLPatternSet& scriptable_hosts = params.scriptable_hosts; |
+ |
const Extension* extension = extensions_.GetByID(extension_id); |
if (!extension) |
return; |
scoped_refptr<const PermissionSet> delta = |
- new PermissionSet(apis, explicit_hosts, scriptable_hosts); |
+ new PermissionSet(apis, manifest_permissions, |
+ explicit_hosts, scriptable_hosts); |
scoped_refptr<const PermissionSet> old_active = |
extension->GetActivePermissions(); |
UpdatedExtensionPermissionsInfo::Reason reason = |
@@ -1431,7 +1437,8 @@ void Dispatcher::OnUpdateTabSpecificPermissions( |
PermissionsData::UpdateTabSpecificPermissions( |
extension, |
tab_id, |
- new PermissionSet(APIPermissionSet(), origin_set, URLPatternSet())); |
+ new PermissionSet(APIPermissionSet(), ManifestPermissionSet(), |
+ origin_set, URLPatternSet())); |
} |
void Dispatcher::OnClearTabSpecificPermissions( |