Commit fd2bb5ea authored by zork's avatar zork Committed by Commit bot

Add method for telling the Pairing API that enrollment is complete

BUG=None

Review URL: https://codereview.chromium.org/555003002

Cr-Commit-Position: refs/heads/master@{#293879}
parent 966607ad
...@@ -124,6 +124,7 @@ void HostPairingScreen::ConfigureHost(bool accepted_eula, ...@@ -124,6 +124,7 @@ void HostPairingScreen::ConfigureHost(bool accepted_eula,
void HostPairingScreen::EnrollHost(const std::string& auth_token) { void HostPairingScreen::EnrollHost(const std::string& auth_token) {
// TODO(zork,achuith): Enroll device, send error on error. // TODO(zork,achuith): Enroll device, send error on error.
// (http://crbug.com/374990) // (http://crbug.com/374990)
controller_->SetEnrollmentComplete(true);
} }
void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) { void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) {
......
...@@ -269,9 +269,19 @@ void BluetoothHostPairingController::OnPairDevicesMessage( ...@@ -269,9 +269,19 @@ void BluetoothHostPairingController::OnPairDevicesMessage(
// TODO(zork,achuith): Enroll device, send error on error. // TODO(zork,achuith): Enroll device, send error on error.
// (http://crbug.com/374990) // (http://crbug.com/374990)
// For now, test domain is sent in the access token. // For now, test domain is sent in the access token.
enrollment_domain_ = message.parameters().admin_access_token(); FOR_EACH_OBSERVER(Observer, observers_,
ChangeStage(STAGE_PAIRING_DONE); EnrollHost(message.parameters().admin_access_token()));
SendHostStatus(); }
void BluetoothHostPairingController::SetEnrollmentComplete(bool success) {
DCHECK_EQ(current_stage_, STAGE_ENROLLING);
DCHECK(thread_checker_.CalledOnValidThread());
if (success) {
ChangeStage(STAGE_PAIRING_DONE);
SendHostStatus();
} else {
AbortWithError(PAIRING_ERROR_PAIRING_OR_ENROLLMENT, kErrorEnrollmentFailed);
}
} }
void BluetoothHostPairingController::OnCompleteSetupMessage( void BluetoothHostPairingController::OnCompleteSetupMessage(
......
...@@ -67,6 +67,7 @@ class BluetoothHostPairingController ...@@ -67,6 +67,7 @@ class BluetoothHostPairingController
virtual std::string GetConfirmationCode() OVERRIDE; virtual std::string GetConfirmationCode() OVERRIDE;
virtual std::string GetEnrollmentDomain() OVERRIDE; virtual std::string GetEnrollmentDomain() OVERRIDE;
virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE; virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE;
virtual void SetEnrollmentComplete(bool success) OVERRIDE;
// ProtoDecoder::Observer: // ProtoDecoder::Observer:
virtual void OnHostStatusMessage( virtual void OnHostStatusMessage(
......
...@@ -10,6 +10,7 @@ const char* kPairingServiceUUID = "f035ff16-c025-468e-bb16-967704d141ea"; ...@@ -10,6 +10,7 @@ const char* kPairingServiceUUID = "f035ff16-c025-468e-bb16-967704d141ea";
const char* kPairingServiceName = "ChromeboxPairing"; const char* kPairingServiceName = "ChromeboxPairing";
const char* kDeviceNamePrefix = "Chromebox_"; const char* kDeviceNamePrefix = "Chromebox_";
const char* kErrorInvalidProtocol = "Invalid protocol"; const char* kErrorInvalidProtocol = "Invalid protocol";
const char* kErrorEnrollmentFailed = "Enrollment failed";
const int kPairingAPIVersion = 1; const int kPairingAPIVersion = 1;
} // namespace pairing_chromeos } // namespace pairing_chromeos
...@@ -11,6 +11,7 @@ extern const char* kPairingServiceUUID; ...@@ -11,6 +11,7 @@ extern const char* kPairingServiceUUID;
extern const char* kPairingServiceName; extern const char* kPairingServiceName;
extern const char* kDeviceNamePrefix; extern const char* kDeviceNamePrefix;
extern const char* kErrorInvalidProtocol; extern const char* kErrorInvalidProtocol;
extern const char* kErrorEnrollmentFailed;
extern const int kPairingAPIVersion; extern const int kPairingAPIVersion;
enum { enum {
......
...@@ -128,6 +128,9 @@ void FakeHostPairingController::OnUpdateStatusChanged( ...@@ -128,6 +128,9 @@ void FakeHostPairingController::OnUpdateStatusChanged(
UpdateStatus update_status) { UpdateStatus update_status) {
} }
void FakeHostPairingController::SetEnrollmentComplete(bool success) {
}
void FakeHostPairingController::PairingStageChanged(Stage new_stage) { void FakeHostPairingController::PairingStageChanged(Stage new_stage) {
switch (new_stage) { switch (new_stage) {
case STAGE_WAITING_FOR_CONTROLLER: { case STAGE_WAITING_FOR_CONTROLLER: {
......
...@@ -42,6 +42,7 @@ class FakeHostPairingController ...@@ -42,6 +42,7 @@ class FakeHostPairingController
virtual std::string GetConfirmationCode() OVERRIDE; virtual std::string GetConfirmationCode() OVERRIDE;
virtual std::string GetEnrollmentDomain() OVERRIDE; virtual std::string GetEnrollmentDomain() OVERRIDE;
virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE; virtual void OnUpdateStatusChanged(UpdateStatus update_status) OVERRIDE;
virtual void SetEnrollmentComplete(bool success) OVERRIDE;
private: private:
void ChangeStage(Stage new_stage); void ChangeStage(Stage new_stage);
......
...@@ -80,6 +80,9 @@ class HostPairingController { ...@@ -80,6 +80,9 @@ class HostPairingController {
// Can be called on stage |STAGE_UPDATING|. // Can be called on stage |STAGE_UPDATING|.
virtual void OnUpdateStatusChanged(UpdateStatus update_status) = 0; virtual void OnUpdateStatusChanged(UpdateStatus update_status) = 0;
// Called when enrollment has completed.
virtual void SetEnrollmentComplete(bool success) = 0;
virtual void AddObserver(Observer* observer) = 0; virtual void AddObserver(Observer* observer) = 0;
virtual void RemoveObserver(Observer* observer) = 0; virtual void RemoveObserver(Observer* observer) = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment