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 601d6aa890232206e7692796932115d05a818feb..fdf3182f20faf844872cf53f87f68fddcb660664 100644 |
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc |
@@ -216,15 +216,30 @@ void EnrollmentScreen::OnOtherError( |
void EnrollmentScreen::OnDeviceEnrolled(const std::string& additional_token) { |
if (!additional_token.empty()) |
SendEnrollmentAuthToken(additional_token); |
- StartupUtils::MarkDeviceRegistered( |
- base::Bind(&EnrollmentScreen::ShowEnrollmentStatusOnSuccess, |
- weak_ptr_factory_.GetWeakPtr())); |
+ |
+ int status = 0; |
+ // TODO: add the device attribute update permission request |
+ // If user is permitted to name a device |
+ // Show device naming screen |
+ if (status == 0) { |
+ StartupUtils::MarkDeviceRegistered( |
+ base::Bind(&EnrollmentScreen::ShowDeviceNamingScreen, |
+ weak_ptr_factory_.GetWeakPtr())); |
+ } else { |
+ StartupUtils::MarkDeviceRegistered( |
+ base::Bind(&EnrollmentScreen::ShowEnrollmentStatusOnSuccess, |
+ weak_ptr_factory_.GetWeakPtr())); |
+ } |
if (remora_controller_) { |
remora_controller_->OnEnrollmentStatusChanged( |
HostPairingController::ENROLLMENT_STATUS_SUCCESS); |
} |
} |
+void EnrollmentScreen::ShowDeviceNamingScreen() { |
+ actor_->ShowDeviceNamingScreen(); |
+} |
+ |
void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) { |
// TODO(achuith, zork): Extract and send domain. |
DCHECK(shark_controller_); |