Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor. h" 10 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor. h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual void OnUserActed(const std::string& action) OVERRIDE; 48 virtual void OnUserActed(const std::string& action) OVERRIDE;
49 49
50 // Context for sharing data between C++ and JS. 50 // Context for sharing data between C++ and JS.
51 // TODO(dzhioev): move to BaseScreen when possible. 51 // TODO(dzhioev): move to BaseScreen when possible.
52 ScreenContext context_; 52 ScreenContext context_;
53 53
54 ControllerPairingScreenActor* actor_; 54 ControllerPairingScreenActor* actor_;
55 55
56 // Controller performing pairing. Owned by the wizard controller. 56 // Controller performing pairing. Owned by the wizard controller.
57 pairing_chromeos::ControllerPairingController* controller_; 57 pairing_chromeos::ControllerPairingController* controller_;
58 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.
58 59
59 // Current stage of pairing process. 60 // Current stage of pairing process.
60 Stage current_stage_; 61 Stage current_stage_;
61 62
62 // If this one is |false| first device in device list will be preselected on 63 // If this one is |false| first device in device list will be preselected on
63 // next device list update. 64 // next device list update.
64 bool device_preselected_; 65 bool device_preselected_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreen); 67 DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreen);
67 }; 68 };
68 69
69 } // namespace chromeos 70 } // namespace chromeos
70 71
71 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_ 72 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698