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

Unified Diff: content/common/feature_policy/feature_policy.cc

Issue 2848443005: Feature Policy: Only add container policy once (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/feature_policy/feature_policy.cc
diff --git a/content/common/feature_policy/feature_policy.cc b/content/common/feature_policy/feature_policy.cc
index 1211672a0f0c474154b17f80f4a1249dd00d35fd..22cbb9309241739effc44a91334ef87a7599361c 100644
--- a/content/common/feature_policy/feature_policy.cc
+++ b/content/common/feature_policy/feature_policy.cc
@@ -170,9 +170,9 @@ std::unique_ptr<FeaturePolicy> FeaturePolicy::CreateFromParentPolicy(
} else {
new_policy->inherited_policies_[feature.first] = false;
}
- if (parent_policy && !container_policy.empty())
- new_policy->AddContainerPolicy(container_policy, parent_policy);
}
+ if (parent_policy && !container_policy.empty())
+ new_policy->AddContainerPolicy(container_policy, parent_policy);
return new_policy;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698