chrome/browser/chromeos/login/screens/controller_pairing_screen.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/login/screens/controller_pairing_screen.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/chromeos/login/screens/controller_pairing_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

index e203af1bdea8f1908509a057386c7dbb10a7e0e7..20a9d7fd010f130c93af84adcb4dd155ac9fbcd1 100644

--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

@@ -153,7 +153,7 @@ void ControllerPairingScreen::DiscoveredDevicesListChanged() {

kContextKeyPage,

devices.empty() ? kPageDevicesDiscovery : kPageDeviceSelect);

std::string selected_device = context_.GetString(kContextKeySelectedDevice);

- if (!ContainsValue(devices, selected_device))

+ if (!base::ContainsValue(devices, selected_device))

selected_device.clear();

if (devices.empty()) {

device_preselected_ = false;