Add new version of enrollment screen supporting OAuth.

chrome/browser/chromeos/login/enterprise_enrollment_screen.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 67 matching lines @@
                                     captcha_token_, captcha,
                                     GaiaAuthFetcher::HostedAccountsAllowed);
   } else {
     auth_fetcher_->StartClientLogin(user, access_code,
                                     GaiaConstants::kDeviceManagementService,
                                     std::string(), std::string(),
                                     GaiaAuthFetcher::HostedAccountsAllowed);
   }
 }
 
+void EnterpriseEnrollmentScreen::OnOAuthTokenAvailable(
+    const std::string& user,
+    const std::string& token) {
+  user_ = user;
+  RegisterForDevicePolicy("", token);
+}
+
 void EnterpriseEnrollmentScreen::OnAuthCancelled() {
   UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
                             policy::kMetricEnrollmentCancelled,
                             policy::kMetricEnrollmentSize);
   auth_fetcher_.reset();
   registrar_.reset();
   g_browser_process->browser_policy_connector()->DeviceStopAutoRetry();
   get_screen_observer()->OnExit(
       ScreenObserver::ENTERPRISE_ENROLLMENT_CANCELLED);
 }
@@ skipping 45 matching lines @@
   if (service != GaiaConstants::kDeviceManagementService) {
     UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
                               policy::kMetricEnrollmentOtherFailed,
                               policy::kMetricEnrollmentSize);
     NOTREACHED() << service;
     return;
   }
 
   scoped_ptr<GaiaAuthFetcher> auth_fetcher(auth_fetcher_.release());
 
-  policy::BrowserPolicyConnector* connector =
-      g_browser_process->browser_policy_connector();
-  if (!connector->device_cloud_policy_subsystem()) {
-    NOTREACHED() << "Cloud policy subsystem not initialized.";
-    UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
-                              policy::kMetricEnrollmentOtherFailed,
-                              policy::kMetricEnrollmentSize);
-    if (is_showing_)
-      actor_->ShowFatalEnrollmentError();
-    return;
-  }
-
-  connector->ScheduleServiceInitialization(0);
-  registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
-      connector->device_cloud_policy_subsystem(), this));
-
-  // Push the credentials to the policy infrastructure. It'll start enrollment
-  // and notify us of progress through CloudPolicySubsystem::Observer.
-  connector->SetDeviceCredentials(user_, auth_token);
+  RegisterForDevicePolicy(auth_token, "");
 }
 
 void EnterpriseEnrollmentScreen::OnIssueAuthTokenFailure(
     const std::string& service,
     const GoogleServiceAuthError& error) {
   if (service != GaiaConstants::kDeviceManagementService) {
     NOTREACHED() << service;
     UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
                               policy::kMetricEnrollmentOtherFailed,
                               policy::kMetricEnrollmentSize);
@@ skipping 134 matching lines @@
       LOG(ERROR) << "Enrollment can not proceed because the InstallAttrs "
                  << "has been locked already!";
       actor_->ShowFatalEnrollmentError();
       return;
     }
   }
 
   NOTREACHED();
 }
 
+void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
+    const std::string& gaia_auth_token,
+    const std::string& oauth_token) {
+  policy::BrowserPolicyConnector* connector =
+      g_browser_process->browser_policy_connector();
+  if (!connector->device_cloud_policy_subsystem()) {
+    NOTREACHED() << "Cloud policy subsystem not initialized.";
+    UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
+                              policy::kMetricEnrollmentOtherFailed,
+                              policy::kMetricEnrollmentSize);
+    if (is_showing_)
+      actor_->ShowFatalEnrollmentError();
+    return;
+  }
+
+  connector->ScheduleServiceInitialization(0);
+  registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
+      connector->device_cloud_policy_subsystem(), this));
+
+  // Push the credentials to the policy infrastructure. It'll start enrollment
+  // and notify us of progress through CloudPolicySubsystem::Observer.
+  connector->SetDeviceCredentials(user_, gaia_auth_token, oauth_token);
+}
+
 }  // namespace chromeos