chrome/browser/chromeos/login/screens/controller_pairing_screen.cc - Issue 647043004: WizardScreen is merged to BaseScreen.

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 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: 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 8e2507fff6e6e849781fc234f923e9c2a1d20ce8..345db7131c6ebdc5ae0297e1c3ed1b395f49f2d7 100644

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

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

@@ -18,7 +18,7 @@ ControllerPairingScreen::ControllerPairingScreen(

ScreenObserver* observer,

ControllerPairingScreenActor* actor,

ControllerPairingController* shark_controller)

- : WizardScreen(observer),

+ : BaseScreen(observer),

actor_(actor),

shark_controller_(shark_controller),

current_stage_(ControllerPairingController::STAGE_NONE),