chrome/browser/chromeos/login/screens/controller_pairing_screen.h - Issue 547503002: Redirect to the enterprise enrollment screen during remora and shark pairing

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.h

Issue 547503002: Redirect to the enterprise enrollment screen during remora and shark pairing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Code review fixes Created 6 years, 3 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

« chrome/browser/chromeos/login/enrollment/enrollment_screen.cc ('K') | « chrome/browser/chromeos/login/enrollment/enrollment_screen.cc ('k') | chrome/browser/chromeos/login/screens/controller_pairing_screen.cc » ('j') | chrome/browser/chromeos/login/screens/controller_pairing_screen.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/controller_pairing_screen.h

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

index cd66be696e813118fe7b41a52e3a1704f1343194..64134ca648bee681744522359bf215dd22feee62 100644

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

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

@@ -55,6 +55,7 @@ class ControllerPairingScreen :

// Controller performing pairing. Owned by the wizard controller.

pairing_chromeos::ControllerPairingController* controller_;

+ bool observing_controller_;

achuithb 2014/09/09 09:02:02 Looks like we don't need this? It's only used befo

Zachary Kuznia 2014/09/09 23:53:58 Aye, I thought it asserted there was an observer.

// Current stage of pairing process.

Stage current_stage_;