Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
index 49aa35019a4d150eab15cc861ace4cc81f97cffb..497a45a36bc4ee7c18ea645a8ae43407140b5074 100644 |
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
@@ -23,6 +23,7 @@ |
#include "chromeos/dbus/dbus_method_call_status.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
#include "chromeos/dbus/session_manager_client.h" |
+#include "components/pairing/controller_pairing_controller.h" |
#include "google_apis/gaia/gaia_auth_util.h" |
#include "google_apis/gaia/google_service_auth_error.h" |
#include "policy/proto/device_management_backend.pb.h" |
@@ -36,6 +37,7 @@ EnrollmentScreen::EnrollmentScreen( |
actor_(actor), |
enrollment_mode_(EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL), |
enrollment_failed_once_(false), |
+ remora_controller_(NULL), |
remora_token_sent_(false), |
lockbox_init_duration_(0), |
weak_ptr_factory_(this) { |
@@ -51,10 +53,12 @@ void EnrollmentScreen::SetParameters( |
EnrollmentScreenActor::EnrollmentMode enrollment_mode, |
const std::string& management_domain, |
const std::string& user, |
- const std::string& auth_token) { |
+ const std::string& auth_token, |
+ pairing_chromeos::ControllerPairingController* remora_controller) { |
enrollment_mode_ = enrollment_mode; |
user_ = user.empty() ? user : gaia::CanonicalizeEmail(user); |
auth_token_ = auth_token; |
+ remora_controller_ = remora_controller; |
actor_->SetParameters(this, enrollment_mode_, management_domain); |
} |
@@ -193,9 +197,11 @@ void EnrollmentScreen::OnConfirmationClosed() { |
!user_.empty() && |
LoginUtils::IsWhitelisted(user_, NULL)) { |
actor_->ShowLoginSpinnerScreen(); |
+ LOG(ERROR) << "OnExit()"; |
get_screen_observer()->OnExit( |
ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED); |
} else { |
+ LOG(ERROR) << "OnExit()"; |
actor_->ResetAuth( |
base::Bind(&ScreenObserver::OnExit, |
base::Unretained(get_screen_observer()), |
@@ -234,7 +240,9 @@ void EnrollmentScreen::RegisterForDevicePolicy(const std::string& token) { |
} |
void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) { |
- // TODO(achuith, zork): Send token via Bluetooth to remote device. |
+ // TODO(achuith, zork): Extract and send domain. |
+ if (remora_controller_) |
+ remora_controller_->OnAuthenticationDone("", token); |
} |
void EnrollmentScreen::ShowEnrollmentStatusOnSuccess( |