chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.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/chromeos/launcher_search_provider/launcher_search_provider_service.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

« no previous file with comments | « chrome/browser/chromeos/file_system_provider/service.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc

diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc

index 3e774fcdc2dddc81a9ffe80dac1bd9ca8558a4c3..b1aeaf25b379febdc71254b085def48a4f9103b5 100644

--- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc

+++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc

@@ -94,7 +94,8 @@ void Service::OnQueryEnded() {

void Service::OnOpenResult(const ExtensionId& extension_id,

const std::string& item_id) {

CacheListenerExtensionIds();

- CHECK(ContainsValue(*cached_listener_extension_ids_.get(), extension_id));

+ CHECK(

+ base::ContainsValue(*cached_listener_extension_ids_.get(), extension_id));

extensions::EventRouter* event_router =

extensions::EventRouter::Get(profile_);

@@ -119,8 +120,10 @@ void Service::SetSearchResults(

// If |extension| is not in the listener extensions list, ignore it.

CacheListenerExtensionIds();

- if (!ContainsValue(*cached_listener_extension_ids_.get(), extension->id()))

+ if (!base::ContainsValue(*cached_listener_extension_ids_.get(),

+ extension->id())) {

return;

+ }

// Set search results to provider.

DCHECK(provider_);