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

Unified Diff: extensions/common/extension_messages.cc

Issue 2820333003: Revert of Communicate ExtensionSettings policy to renderers (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « extensions/common/extension_messages.h ('k') | extensions/common/permissions/permissions_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/extension_messages.cc
diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc
index 4998ca8db79dc368af79740e450b59625733b621..8e56f09da3846e298b97dae446fae47936a1fb63 100644
--- a/extensions/common/extension_messages.cc
+++ b/extensions/common/extension_messages.cc
@@ -64,14 +64,8 @@
location(extension->location()),
path(extension->path()),
active_permissions(extension->permissions_data()->active_permissions()),
- withheld_permissions(
- extension->permissions_data()->withheld_permissions()),
- policy_blocked_hosts(
- extension->permissions_data()->policy_blocked_hosts()),
- policy_allowed_hosts(
- extension->permissions_data()->policy_allowed_hosts()),
- uses_default_policy_blocked_allowed_hosts(
- extension->permissions_data()->UsesDefaultPolicyHostRestrictions()),
+ withheld_permissions(extension->permissions_data()
+ ->withheld_permissions()),
id(extension->id()),
creation_flags(extension->creation_flags()) {
if (include_tab_permissions) {
@@ -98,12 +92,6 @@
extension->permissions_data();
permissions_data->SetPermissions(active_permissions.ToPermissionSet(),
withheld_permissions.ToPermissionSet());
- if (uses_default_policy_blocked_allowed_hosts) {
- permissions_data->SetUsesDefaultHostRestrictions();
- } else {
- permissions_data->SetPolicyHostRestrictions(policy_blocked_hosts,
- policy_allowed_hosts);
- }
for (const auto& pair : tab_specific_permissions) {
permissions_data->UpdateTabSpecificPermissions(
pair.first, *pair.second.ToPermissionSet());
@@ -333,9 +321,6 @@
GetParamSize(s, p.manifest_permissions);
GetParamSize(s, p.explicit_hosts);
GetParamSize(s, p.scriptable_hosts);
- GetParamSize(s, p.policy_blocked_hosts);
- GetParamSize(s, p.policy_allowed_hosts);
- GetParamSize(s, p.uses_default_policy_host_restrictions);
}
void ParamTraits<ExtensionMsg_PermissionSetStruct>::Write(base::Pickle* m,
@@ -344,9 +329,6 @@
WriteParam(m, p.manifest_permissions);
WriteParam(m, p.explicit_hosts);
WriteParam(m, p.scriptable_hosts);
- WriteParam(m, p.policy_blocked_hosts);
- WriteParam(m, p.policy_allowed_hosts);
- WriteParam(m, p.uses_default_policy_host_restrictions);
}
bool ParamTraits<ExtensionMsg_PermissionSetStruct>::Read(
@@ -356,10 +338,7 @@
return ReadParam(m, iter, &p->apis) &&
ReadParam(m, iter, &p->manifest_permissions) &&
ReadParam(m, iter, &p->explicit_hosts) &&
- ReadParam(m, iter, &p->scriptable_hosts) &&
- ReadParam(m, iter, &p->policy_blocked_hosts) &&
- ReadParam(m, iter, &p->policy_allowed_hosts) &&
- ReadParam(m, iter, &p->uses_default_policy_host_restrictions);
+ ReadParam(m, iter, &p->scriptable_hosts);
}
void ParamTraits<ExtensionMsg_PermissionSetStruct>::Log(const param_type& p,
@@ -368,9 +347,6 @@
LogParam(p.manifest_permissions, l);
LogParam(p.explicit_hosts, l);
LogParam(p.scriptable_hosts, l);
- LogParam(p.policy_blocked_hosts, l);
- LogParam(p.policy_allowed_hosts, l);
- LogParam(p.uses_default_policy_host_restrictions, l);
}
void ParamTraits<ExtensionMsg_Loaded_Params>::Write(base::Pickle* m,
@@ -383,9 +359,6 @@
WriteParam(m, p.active_permissions);
WriteParam(m, p.withheld_permissions);
WriteParam(m, p.tab_specific_permissions);
- WriteParam(m, p.policy_blocked_hosts);
- WriteParam(m, p.policy_allowed_hosts);
- WriteParam(m, p.uses_default_policy_blocked_allowed_hosts);
}
bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const base::Pickle* m,
@@ -397,10 +370,7 @@
ReadParam(m, iter, &p->creation_flags) && ReadParam(m, iter, &p->id) &&
ReadParam(m, iter, &p->active_permissions) &&
ReadParam(m, iter, &p->withheld_permissions) &&
- ReadParam(m, iter, &p->tab_specific_permissions) &&
- ReadParam(m, iter, &p->policy_blocked_hosts) &&
- ReadParam(m, iter, &p->policy_allowed_hosts) &&
- ReadParam(m, iter, &p->uses_default_policy_blocked_allowed_hosts);
+ ReadParam(m, iter, &p->tab_specific_permissions);
}
void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,
« no previous file with comments | « extensions/common/extension_messages.h ('k') | extensions/common/permissions/permissions_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698