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

Unified Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Issue 390443006: Support for remote enrollment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bartfab feedback Created 6 years, 4 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.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index 72332bd14aef0d3527624b519e8bf4a049fae587..86ea2fb0705e348816e1bc923a438c29bc0d0edb 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"
@@ -47,9 +48,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 +66,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 +136,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()->
+ GetDeviceCloudPolicyManager()->IsSharkRequisition();
bartfab (slow) 2014/08/13 14:20:14 Nit: Indent four more spaces.
achuithb 2014/08/13 23:48:39 Done.
+
+ if (is_shark && auth_token_.empty()) {
+ // Fetch a second token for shark devices.
+ auth_token_ = token;
+ actor_->FetchOAuthToken();
+ SendEnrollmentAuthToken(token);
+ } else {
+ RegisterForDevicePolicy(token);
+ }
}
void EnrollmentScreen::OnRetry() {
@@ -212,6 +231,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.
+}
+
void EnrollmentScreen::ShowEnrollmentStatusOnSuccess(
const policy::EnrollmentStatus& status) {
actor_->ShowEnrollmentStatus(status);
« no previous file with comments | « chrome/browser/chromeos/login/enrollment/enrollment_screen.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698