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

Unified Diff: chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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
Index: chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
index 05fcde9e443b9e91b4927faf0afaea63603b7798..ca4a99414c081b4fbd0df006b0783570c5a41ba2 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
@@ -136,7 +136,7 @@ void ChromeContentRulesRegistry::DidNavigateMainFrame(
content::WebContents* contents,
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) {
- if (ContainsKey(active_rules_, contents)) {
+ if (base::ContainsKey(active_rules_, contents)) {
EvaluationScope evaluation_scope(this);
for (const std::unique_ptr<ContentPredicateEvaluator>& evaluator :
evaluators_)
@@ -321,7 +321,7 @@ std::string ChromeContentRulesRegistry::RemoveRulesImpl(
// Remove the ContentRule from active_rules_.
for (auto& tab_rules_pair : active_rules_) {
- if (ContainsKey(tab_rules_pair.second, rule)) {
+ if (base::ContainsKey(tab_rules_pair.second, rule)) {
ContentAction::ApplyInfo apply_info =
{rule->extension, browser_context(), tab_rules_pair.first,
rule->priority};
@@ -363,14 +363,14 @@ std::string ChromeContentRulesRegistry::RemoveAllRulesImpl(
void ChromeContentRulesRegistry::EvaluateConditionsForTab(
content::WebContents* tab) {
std::set<const ContentRule*> matching_rules = GetMatchingRules(tab);
- if (matching_rules.empty() && !ContainsKey(active_rules_, tab))
+ if (matching_rules.empty() && !base::ContainsKey(active_rules_, tab))
return;
std::set<const ContentRule*>& prev_matching_rules = active_rules_[tab];
for (const ContentRule* rule : matching_rules) {
ContentAction::ApplyInfo apply_info =
{rule->extension, browser_context(), tab, rule->priority};
- if (!ContainsKey(prev_matching_rules, rule)) {
+ if (!base::ContainsKey(prev_matching_rules, rule)) {
for (const std::unique_ptr<const ContentAction>& action : rule->actions)
action->Apply(apply_info);
} else {
@@ -379,7 +379,7 @@ void ChromeContentRulesRegistry::EvaluateConditionsForTab(
}
}
for (const ContentRule* rule : prev_matching_rules) {
- if (!ContainsKey(matching_rules, rule)) {
+ if (!base::ContainsKey(matching_rules, rule)) {
ContentAction::ApplyInfo apply_info =
{rule->extension, browser_context(), tab, rule->priority};
for (const std::unique_ptr<const ContentAction>& action : rule->actions)

Powered by Google App Engine
This is Rietveld 408576698