chrome/browser/extensions/extension_action_runner.cc - Issue 2230203002: chrome: Use stl utilities from the base namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_action_runner.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:

Index: chrome/browser/extensions/extension_action_runner.cc

diff --git a/chrome/browser/extensions/extension_action_runner.cc b/chrome/browser/extensions/extension_action_runner.cc

index ad112f584108c2dfcd5e1c9fe4a90b68068ca10d..654129f1428077796fcd58edad6329cd269153cb 100644

--- a/chrome/browser/extensions/extension_action_runner.cc

+++ b/chrome/browser/extensions/extension_action_runner.cc

@@ -125,7 +125,7 @@ ExtensionAction::ShowAction ExtensionActionRunner::RunAction(

}

void ExtensionActionRunner::RunBlockedActions(const Extension* extension) {

- DCHECK(ContainsKey(pending_scripts_, extension->id()) ||

+ DCHECK(base::ContainsKey(pending_scripts_, extension->id()) ||

web_request_blocked_.count(extension->id()) != 0);

// Clicking to run the extension counts as granting it permission to run on