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

Unified Diff: chrome/renderer/extensions/dispatcher.cc

Issue 51433002: Enable permission warnings from ManifestHandlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test and clang presubmit errors. Created 7 years, 1 month 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/renderer/extensions/dispatcher.h ('k') | extensions/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/dispatcher.cc
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index ea5ca21ecf245f21331b97530aebd47283a49c5b..943e97d334d75917106c37911ff25080aacf7b38 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -1375,17 +1375,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 =
@@ -1428,7 +1434,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(
« no previous file with comments | « chrome/renderer/extensions/dispatcher.h ('k') | extensions/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698