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

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: 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
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 d2d8516be2a67c1285d83882fda8f23f90ab38d8..b580c6a12e6a89c3f6d951e236d67022f667ca39 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
@@ -13,9 +13,14 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
#include "chrome/browser/chromeos/login/screens/wizard_screen.h"
+#include "components/pairing/host_pairing_controller.h"
#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 ScreenManager;
@@ -25,18 +30,24 @@ class ScreenObserver;
// OOBE wizard.
class EnrollmentScreen
: public WizardScreen,
+ public pairing_chromeos::HostPairingController::Observer,
public EnrollmentScreenActor::Controller {
public:
+ typedef pairing_chromeos::HostPairingController::Stage Stage;
+
EnrollmentScreen(ScreenObserver* observer,
EnrollmentScreenActor* actor);
virtual ~EnrollmentScreen();
static EnrollmentScreen* Get(ScreenManager* manager);
- void SetParameters(EnrollmentScreenActor::EnrollmentMode enrollment_mode,
- const std::string& management_domain,
- const std::string& enrollment_user,
- const std::string& auth_token);
+ void SetParameters(
achuithb 2014/09/09 09:02:02 Let's add a comment explaining what these paramete
Zachary Kuznia 2014/09/09 23:53:58 Done.
+ EnrollmentScreenActor::EnrollmentMode enrollment_mode,
+ const std::string& management_domain,
+ const std::string& enrollment_user,
+ const std::string& auth_token,
+ pairing_chromeos::ControllerPairingController* shark_controller,
+ pairing_chromeos::HostPairingController* remora_controller);
// WizardScreen implementation:
virtual void PrepareToShow() OVERRIDE;
@@ -44,6 +55,15 @@ class EnrollmentScreen
virtual void Hide() OVERRIDE;
virtual std::string GetName() const OVERRIDE;
+ // pairing_chromeos::HostPairingController::Observer:
+ virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
+ virtual void ConfigureHost(bool accepted_eula,
+ const std::string& lang,
+ const std::string& timezone,
+ bool send_reports,
+ const std::string& keyboard_layout) OVERRIDE;
+ virtual void EnrollHost(const std::string& auth_token) OVERRIDE;
+
// EnrollmentScreenActor::Controller implementation:
virtual void OnLoginDone(const std::string& user) OVERRIDE;
virtual void OnAuthError(const GoogleServiceAuthError& error) OVERRIDE;
@@ -95,6 +115,8 @@ class EnrollmentScreen
return enrollment_mode_ == EnrollmentScreenActor::ENROLLMENT_MODE_AUTO;
}
+ pairing_chromeos::ControllerPairingController* shark_controller_;
+ pairing_chromeos::HostPairingController* remora_controller_;
EnrollmentScreenActor* actor_;
EnrollmentScreenActor::EnrollmentMode enrollment_mode_;
bool enrollment_failed_once_;

Powered by Google App Engine
This is Rietveld 408576698