chrome/browser/chromeos/login/screens/controller_pairing_screen.cc - Issue 672203003: ScreenContext is moved to components/login.

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 672203003: ScreenContext is moved to components/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 6 years, 2 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 4f825d8868307610ffefff6f02776161e82eb5f7..7b7308e086159a5c1e76e25c74a71838792f5e10 100644

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

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

@@ -75,7 +75,7 @@ void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {

switch (new_stage) {

case ControllerPairingController::STAGE_DEVICES_DISCOVERY: {

desired_page = kPageDevicesDiscovery;

- context_.SetStringList(kContextKeyDevices, StringList());

+ context_.SetStringList(kContextKeyDevices, ::login::StringList());

context_.SetString(kContextKeySelectedDevice, std::string());

device_preselected_ = false;

break;