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

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_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: 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/enrollment_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.h
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
index 48a7b8d5b3232f34af11f6d46594e8165ce64bb3..9fbc6e1b0228f73cbf77f3a98b3c52993ba6f9a6 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
@@ -16,6 +16,10 @@
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/core/common/cloud/enterprise_metrics.h"
+namespace pairing_chromeos {
+class ControllerPairingController;
+}
+
namespace chromeos {
class ScreenObserver;
@@ -30,10 +34,12 @@ class EnrollmentScreen
EnrollmentScreenActor* actor);
virtual ~EnrollmentScreen();
- void SetParameters(EnrollmentScreenActor::EnrollmentMode enrollment_mode,
- const std::string& management_domain,
- const std::string& enrollment_user,
- const std::string& auth_token);
+ void SetParameters(
+ EnrollmentScreenActor::EnrollmentMode enrollment_mode,
+ const std::string& management_domain,
+ const std::string& enrollment_user,
+ const std::string& auth_token,
achuithb 2014/09/05 00:26:23 Maybe we should just pass in a callback instead: b
Zachary Kuznia 2014/09/09 00:51:53 auth_token_ and the controller are actually mutual
+ pairing_chromeos::ControllerPairingController* remora_controller);
// WizardScreen implementation:
virtual void PrepareToShow() OVERRIDE;
@@ -95,6 +101,7 @@ class EnrollmentScreen
EnrollmentScreenActor* actor_;
EnrollmentScreenActor::EnrollmentMode enrollment_mode_;
bool enrollment_failed_once_;
+ pairing_chromeos::ControllerPairingController* remora_controller_;
achuithb 2014/09/05 00:26:23 Maybe move this up next to actor_?
Zachary Kuznia 2014/09/09 00:51:53 Done.
bool remora_token_sent_;
std::string user_;
std::string auth_token_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/enrollment/enrollment_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698