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

Unified Diff: chrome/browser/extensions/extension_prefs.cc

Issue 7347011: Update URLPatternSet to contain a std::set instead of std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows compile errors. Created 9 years, 5 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: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index f47b451cb1d42264676783ea92b8428698f64c2c..2cb6efe1af2e0b1105d29c838fd87cb2ac2d0037 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -398,7 +398,7 @@ bool ExtensionPrefs::ReadExtensionPrefURLPatternSet(
return false;
}
if (!allow_file_access && pattern.MatchesScheme(chrome::kFileScheme)) {
- pattern.set_valid_schemes(
+ pattern.SetValidSchemes(
pattern.valid_schemes() & ~URLPattern::SCHEME_FILE);
}
result->AddPattern(pattern);
@@ -412,8 +412,8 @@ void ExtensionPrefs::SetExtensionPrefURLPatternSet(
const std::string& pref_key,
const URLPatternSet& new_value) {
ListValue* value = new ListValue();
- for (URLPatternList::const_iterator i = new_value.patterns().begin();
- i != new_value.patterns().end(); ++i)
+ for (URLPatternSet::const_iterator i = new_value.begin();
+ i != new_value.end(); ++i)
value->AppendIfNotPresent(Value::CreateStringValue(i->GetAsString()));
UpdateExtensionPref(extension_id, pref_key, value);
« no previous file with comments | « chrome/browser/extensions/extension_management_api.cc ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698