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

Side by Side Diff: extensions/browser/api/declarative_webrequest/webrequest_rules_registry.cc

Issue 822453002: Introduce HostID and de-couple Extensions from "script injection System" [browser side] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Introduce HostID for DeclarativeUserScriptMaser assignment, remove ConsumerID. Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/declarative_webrequest/webrequest_rules_registr y.h" 5 #include "extensions/browser/api/declarative_webrequest/webrequest_rules_registr y.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 const Extension* extension = 173 const Extension* extension =
174 extension_info_map_->extensions().GetByID(extension_id); 174 extension_info_map_->extensions().GetByID(extension_id);
175 RulesMap& registered_rules = webrequest_rules_[extension_id]; 175 RulesMap& registered_rules = webrequest_rules_[extension_id];
176 176
177 for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator rule = 177 for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator rule =
178 rules.begin(); rule != rules.end(); ++rule) { 178 rules.begin(); rule != rules.end(); ++rule) {
179 const WebRequestRule::RuleId& rule_id(*(*rule)->id); 179 const WebRequestRule::RuleId& rule_id(*(*rule)->id);
180 DCHECK(registered_rules.find(rule_id) == registered_rules.end()); 180 DCHECK(registered_rules.find(rule_id) == registered_rules.end());
181 181
182 scoped_ptr<WebRequestRule> webrequest_rule(WebRequestRule::Create( 182 scoped_ptr<WebRequestRule> webrequest_rule(WebRequestRule::Create(
183 url_matcher_.condition_factory(), browser_context(), extension, 183 url_matcher_.condition_factory(), browser_context(),
184 HostID(HostID::EXTENSIONS, extension->id()), extension,
184 extension_installation_time, *rule, 185 extension_installation_time, *rule,
185 base::Bind(&Checker, base::Unretained(extension)), &error)); 186 base::Bind(&Checker, base::Unretained(extension)), &error));
186 if (!error.empty()) { 187 if (!error.empty()) {
187 // We don't return here, because we want to clear temporary 188 // We don't return here, because we want to clear temporary
188 // condition sets in the url_matcher_. 189 // condition sets in the url_matcher_.
189 break; 190 break;
190 } 191 }
191 192
192 new_webrequest_rules.push_back( 193 new_webrequest_rules.push_back(
193 IdRulePair(rule_id, make_linked_ptr(webrequest_rule.release()))); 194 IdRulePair(rule_id, make_linked_ptr(webrequest_rule.release())));
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 RuleTriggers::const_iterator rule_trigger = rule_triggers_.find(*url_match); 403 RuleTriggers::const_iterator rule_trigger = rule_triggers_.find(*url_match);
403 CHECK(rule_trigger != rule_triggers_.end()); 404 CHECK(rule_trigger != rule_triggers_.end());
404 if (!ContainsKey(*result, rule_trigger->second) && 405 if (!ContainsKey(*result, rule_trigger->second) &&
405 rule_trigger->second->conditions().IsFulfilled(*url_match, 406 rule_trigger->second->conditions().IsFulfilled(*url_match,
406 request_data)) 407 request_data))
407 result->insert(rule_trigger->second); 408 result->insert(rule_trigger->second);
408 } 409 }
409 } 410 }
410 411
411 } // namespace extensions 412 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698