Chromium Code Reviews| Index: extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc |
| diff --git a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc |
| index 0907ebd7887aa88c82605053550be7b7b16eee5d..0a3b1a1b453d8932c58f4713efc8de8af30bd12c 100644 |
| --- a/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc |
| +++ b/extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc |
| @@ -17,6 +17,7 @@ |
| #include "extensions/browser/extension_system.h" |
| #include "extensions/common/error_utils.h" |
| #include "extensions/common/extension.h" |
| +#include "extensions/common/extension_id.h" |
|
Devlin
2016/11/11 23:10:06
don't need this here; it's in the .h
lazyboy
2016/11/12 00:13:16
Done.
|
| #include "extensions/common/permissions/permissions_data.h" |
| #include "net/url_request/url_request.h" |
| @@ -99,7 +100,6 @@ std::list<LinkedPtrEventResponseDelta> WebRequestRulesRegistry::CreateDeltas( |
| // for rules of that extension. Initially, this priority is -infinite and |
| // will be increased when the rules are processed and raise the bar via |
| // WebRequestIgnoreRulesActions. |
| - typedef std::string ExtensionId; |
| typedef std::map<ExtensionId, WebRequestRule::Priority> MinPriorities; |
| typedef std::map<ExtensionId, std::set<std::string> > IgnoreTags; |
| MinPriorities min_priorities; |
| @@ -289,8 +289,8 @@ bool WebRequestRulesRegistry::IsEmpty() const { |
| return false; |
| // Now all the registered rules for each extensions. |
| - for (const std::pair<WebRequestRule::ExtensionId, RulesMap>& |
| - extension_id_rules_map_pair : webrequest_rules_) { |
| + for (const std::pair<ExtensionId, RulesMap>& extension_id_rules_map_pair : |
| + webrequest_rules_) { |
| if (!extension_id_rules_map_pair.second.empty()) |
| return false; |
| } |