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

Unified Diff: chrome/browser/automation/testing_automation_provider.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
« no previous file with comments | « no previous file | chrome/browser/extensions/convert_user_script.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 0893b506f6aaf09012f0edc9787973243b3bb2ba..b7eccd8b0b10e19c71e7e15e643dc53428a1ac22 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -4080,15 +4080,15 @@ void TestingAutomationProvider::GetThemeInfo(
namespace {
ListValue* GetHostPermissions(const Extension* ext, bool effective_perm) {
- URLPatternList pattern_list;
+ URLPatternSet pattern_set;
if (effective_perm)
- pattern_list = ext->GetEffectiveHostPermissions().patterns();
+ pattern_set = ext->GetEffectiveHostPermissions();
else
- pattern_list = ext->permission_set()->explicit_hosts().patterns();
+ pattern_set = ext->permission_set()->explicit_hosts();
ListValue* permissions = new ListValue;
- for (URLPatternList::const_iterator perm = pattern_list.begin();
- perm != pattern_list.end(); ++perm) {
+ for (URLPatternSet::const_iterator perm = pattern_set.begin();
+ perm != pattern_set.end(); ++perm) {
permissions->Append(new StringValue(perm->GetAsString()));
}
« no previous file with comments | « no previous file | chrome/browser/extensions/convert_user_script.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698