Chromium Code Reviews| 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 72332bd14aef0d3527624b519e8bf4a049fae587..55ac49c7c872d6c4da6dbe11db0f3606919cea77 100644 |
| --- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
| +++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
| @@ -17,6 +17,7 @@ |
| #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" |
| +#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| #include "chromeos/dbus/cryptohome_client.h" |
| #include "chromeos/dbus/dbus_method_call_status.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| @@ -34,6 +35,7 @@ EnrollmentScreen::EnrollmentScreen( |
| actor_(actor), |
| enrollment_mode_(EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL), |
| enrollment_failed_once_(false), |
| + remora_token_sent_(false), |
| lockbox_init_duration_(0), |
| weak_ptr_factory_(this) { |
| // Init the TPM if it has not been done until now (in debug build we might |
| @@ -47,9 +49,11 @@ EnrollmentScreen::~EnrollmentScreen() {} |
| void EnrollmentScreen::SetParameters( |
| EnrollmentScreenActor::EnrollmentMode enrollment_mode, |
| const std::string& management_domain, |
| - const std::string& user) { |
| + const std::string& user, |
| + const std::string& auth_token) { |
| enrollment_mode_ = enrollment_mode; |
| user_ = user.empty() ? user : gaia::CanonicalizeEmail(user); |
| + auth_token_ = auth_token; |
| actor_->SetParameters(this, enrollment_mode_, management_domain); |
| } |
| @@ -63,10 +67,14 @@ void EnrollmentScreen::Show() { |
| UMA(policy::kMetricEnrollmentAutoStarted); |
| actor_->ShowEnrollmentSpinnerScreen(); |
| actor_->FetchOAuthToken(); |
| - } else { |
| + } else if (auth_token_.empty()) { |
| UMA(policy::kMetricEnrollmentTriggered); |
| actor_->ResetAuth(base::Bind(&EnrollmentScreen::ShowSigninScreen, |
| weak_ptr_factory_.GetWeakPtr())); |
| + } else { |
| + actor_->Show(); |
| + actor_->ShowEnrollmentSpinnerScreen(); |
| + OnOAuthTokenAvailable(auth_token_); |
| } |
| } |
| @@ -129,7 +137,19 @@ void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) { |
| } |
| void EnrollmentScreen::OnOAuthTokenAvailable(const std::string& token) { |
| - RegisterForDevicePolicy(token); |
| + VLOG(1) << "OnOAuthTokenAvailable " << token; |
| + const bool is_shark = |
| + g_browser_process->platform_part()->browser_policy_connector_chromeos()-> |
|
bartfab (slow)
2014/08/20 09:31:34
Nit: #include "chrome/browser/process/browser_proc
achuithb
2014/08/25 20:50:37
Done.
|
| + GetDeviceCloudPolicyManager()->IsSharkRequisition(); |
| + |
| + if (is_shark && !remora_token_sent_) { |
| + // Fetch a second token for shark devices. |
| + remora_token_sent_ = true; |
| + SendEnrollmentAuthToken(token); |
| + actor_->FetchOAuthToken(); |
| + } else { |
| + RegisterForDevicePolicy(token); |
| + } |
| } |
| void EnrollmentScreen::OnRetry() { |
| @@ -212,6 +232,10 @@ void EnrollmentScreen::RegisterForDevicePolicy(const std::string& token) { |
| weak_ptr_factory_.GetWeakPtr())); |
| } |
| +void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) { |
| + // TODO(achuith, zork): Send token via bluetooth to remote device. |
|
bartfab (slow)
2014/08/20 09:31:34
Nit: s/bluetooth/Bluetooth/
achuithb
2014/08/25 20:50:37
Done.
|
| +} |
| + |
| void EnrollmentScreen::ShowEnrollmentStatusOnSuccess( |
| const policy::EnrollmentStatus& status) { |
| actor_->ShowEnrollmentStatus(status); |