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

Unified Diff: extensions/common/url_pattern_set.cc

Issue 12209094: Support requesting subsets of host permissions using the permissions API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix urlpatternsettest Created 7 years, 10 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
Index: extensions/common/url_pattern_set.cc
diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc
index 40663201c1c5a66169f5160a43eaa67f8f7d6f5f..92a628fac5557137496bf6961b01b74caf2fdc54 100644
--- a/extensions/common/url_pattern_set.cc
+++ b/extensions/common/url_pattern_set.cc
@@ -129,9 +129,14 @@ void URLPatternSet::ClearPatterns() {
patterns_.clear();
}
-bool URLPatternSet::Contains(const URLPatternSet& set) const {
- return std::includes(patterns_.begin(), patterns_.end(),
- set.patterns_.begin(), set.patterns_.end());
+bool URLPatternSet::Contains(const URLPatternSet& other) const {
+ for (URLPatternSet::const_iterator it = other.begin();
+ it != other.end(); ++it) {
+ if (!Encompasses(*it))
+ return false;
+ }
+
+ return true;
}
bool URLPatternSet::MatchesURL(const GURL& url) const {
@@ -216,4 +221,23 @@ bool URLPatternSet::Populate(const base::ListValue& value,
return Populate(patterns, valid_schemes, allow_file_access, error);
}
+bool URLPatternSet::Encompasses(const URLPattern& pattern) const {
+ for (URLPatternSet::const_iterator it = begin();
+ it != end(); ++it) {
+ if (it->Encompasses(pattern))
+ return true;
+ }
+ return false;
+}
+
+std::ostream& operator<<(std::ostream& out, const URLPatternSet& set) {
+ out << "{";
+ for (URLPatternSet::const_iterator it = set.begin(); it != set.end(); ++it) {
+ if (it != set.begin())
+ out << ",";
+ out << it->GetAsString();
+ }
+ return out << "}";
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698