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

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

Issue 8733004: Make ExtensionService use ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: = Created 9 years, 1 month 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_info_map.cc
diff --git a/chrome/browser/extensions/extension_info_map.cc b/chrome/browser/extensions/extension_info_map.cc
index d3210a6f08346a4e77dd9b8c35db2d8f1f36c67c..26384a13b8533da9d73c198d3e7cc648132ed93e 100644
--- a/chrome/browser/extensions/extension_info_map.cc
+++ b/chrome/browser/extensions/extension_info_map.cc
@@ -136,11 +136,11 @@ bool ExtensionInfoMap::SecurityOriginHasAPIPermission(
process_map_.Contains(id, process_id);
}
- ExtensionSet::ExtensionMap::const_iterator i = extensions_.begin();
+ ExtensionSet::const_iterator i = extensions_.begin();
for (; i != extensions_.end(); ++i) {
- if (i->second->web_extent().MatchesSecurityOrigin(origin) &&
- process_map_.Contains(i->first, process_id) &&
- i->second->HasAPIPermission(permission)) {
+ if ((*i)->web_extent().MatchesSecurityOrigin(origin) &&
+ process_map_.Contains((*i)->id(), process_id) &&
+ (*i)->HasAPIPermission(permission)) {
return true;
}
}

Powered by Google App Engine
This is Rietveld 408576698