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

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

Issue 493633003: Browser changes for wiring up RequestContentScript API to shared memory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit: Inline methods in unit tests Created 6 years, 3 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 "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h" 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 extension_info_map_->extensions().GetByID(extension_id); 175 extension_info_map_->extensions().GetByID(extension_id);
176 RulesMap& registered_rules = webrequest_rules_[extension_id]; 176 RulesMap& registered_rules = webrequest_rules_[extension_id];
177 177
178 for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator rule = 178 for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator rule =
179 rules.begin(); rule != rules.end(); ++rule) { 179 rules.begin(); rule != rules.end(); ++rule) {
180 const WebRequestRule::RuleId& rule_id(*(*rule)->id); 180 const WebRequestRule::RuleId& rule_id(*(*rule)->id);
181 DCHECK(registered_rules.find(rule_id) == registered_rules.end()); 181 DCHECK(registered_rules.find(rule_id) == registered_rules.end());
182 182
183 scoped_ptr<WebRequestRule> webrequest_rule(WebRequestRule::Create( 183 scoped_ptr<WebRequestRule> webrequest_rule(WebRequestRule::Create(
184 url_matcher_.condition_factory(), 184 url_matcher_.condition_factory(),
185 extension, extension_installation_time, *rule, 185 profile(), extension, extension_installation_time, *rule,
186 base::Bind(&Checker, base::Unretained(extension)), 186 base::Bind(&Checker, base::Unretained(extension)),
187 &error)); 187 &error));
188 if (!error.empty()) { 188 if (!error.empty()) {
189 // We don't return here, because we want to clear temporary 189 // We don't return here, because we want to clear temporary
190 // condition sets in the url_matcher_. 190 // condition sets in the url_matcher_.
191 break; 191 break;
192 } 192 }
193 193
194 new_webrequest_rules.push_back( 194 new_webrequest_rules.push_back(
195 IdRulePair(rule_id, make_linked_ptr(webrequest_rule.release()))); 195 IdRulePair(rule_id, make_linked_ptr(webrequest_rule.release())));
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 RuleTriggers::const_iterator rule_trigger = rule_triggers_.find(*url_match); 404 RuleTriggers::const_iterator rule_trigger = rule_triggers_.find(*url_match);
405 CHECK(rule_trigger != rule_triggers_.end()); 405 CHECK(rule_trigger != rule_triggers_.end());
406 if (!ContainsKey(*result, rule_trigger->second) && 406 if (!ContainsKey(*result, rule_trigger->second) &&
407 rule_trigger->second->conditions().IsFulfilled(*url_match, 407 rule_trigger->second->conditions().IsFulfilled(*url_match,
408 request_data)) 408 request_data))
409 result->insert(rule_trigger->second); 409 result->insert(rule_trigger->second);
410 } 410 }
411 } 411 }
412 412
413 } // namespace extensions 413 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698