Added OOBE Asset / Naming prompt

chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

 // Copyright (c) 2012 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/enrollment/enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 209 matching lines @@
 
 void EnrollmentScreen::OnOtherError(
     EnterpriseEnrollmentHelper::OtherError error) {
   OnAnyEnrollmentError();
   actor_->ShowOtherError(error);
 }
 
 void EnrollmentScreen::OnDeviceEnrolled(const std::string& additional_token) {
   if (!additional_token.empty())
     SendEnrollmentAuthToken(additional_token);
-  StartupUtils::MarkDeviceRegistered(
-      base::Bind(&EnrollmentScreen::ShowEnrollmentStatusOnSuccess,
+
+  policy::BrowserPolicyConnectorChromeOS* connector =

[Mattias Nissler (ping if slow), 2015/04/10 12:22:28]

This logic should probably all be moved to the enrollment helper.

[Polina Bondarenko, 2015/04/14 14:15:47]

Done.

+      g_browser_process->platform_part()->browser_policy_connector_chromeos();
+  policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
+      connector->GetDeviceCloudPolicyManager();
+
+  policy::CloudPolicyClient* client = policy_manager->core()->client();
+
+  client->GetDeviceAttributeUpdatePermission(
+      enrollment_helper_->GetOAuthToken(),
+      base::Bind(&EnrollmentScreen::OnDeviceNamingPermission,
                  weak_ptr_factory_.GetWeakPtr()));
+
   if (remora_controller_) {

[Mattias Nissler (ping if slow), 2015/04/10 12:22:28]

This should not be run if there's still a Naming permission check pending.

[Polina Bondarenko, 2015/04/14 14:15:47]

Done.

     remora_controller_->OnEnrollmentStatusChanged(
         HostPairingController::ENROLLMENT_STATUS_SUCCESS);
   }
 }
 
+void EnrollmentScreen::OnDeviceNaming(const std::string& asset_id,
+                                      const std::string& location) {
+  policy::BrowserPolicyConnectorChromeOS* connector =

[Mattias Nissler (ping if slow), 2015/04/10 12:22:28]

This stuff should also move to the enrollment helper.

[Polina Bondarenko, 2015/04/14 14:15:47]

Done.

+      g_browser_process->platform_part()->browser_policy_connector_chromeos();
+  policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
+      connector->GetDeviceCloudPolicyManager();
+
+  policy::CloudPolicyClient* client = policy_manager->core()->client();
+
+  client->UpdateDeviceAttributes(enrollment_helper_->GetOAuthToken(), asset_id,
+                                 location,
+                                 base::Bind(&EnrollmentScreen::OnDeviceNamed,
+                                            weak_ptr_factory_.GetWeakPtr()));
+}
+
+void EnrollmentScreen::OnDeviceNamingPermission(bool status) {
+  // If user is permitted to name a device
+  // Show device naming screen
+  if (status) {
+    StartupUtils::MarkDeviceRegistered(
+        base::Bind(&EnrollmentScreen::ShowDeviceNamingScreen,
+                   weak_ptr_factory_.GetWeakPtr()));
+  } else {
+    StartupUtils::MarkDeviceRegistered(
+        base::Bind(&EnrollmentScreen::ShowEnrollmentStatusOnSuccess,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
+}
+
+void EnrollmentScreen::OnDeviceNamed(bool status) {

[Mattias Nissler (ping if slow), 2015/04/10 12:22:28]

This should probably be renamed to OnDeviceAttributeUploadCompleted or somesuch,
to make it clear that this runs to handle the server response.

[Polina Bondarenko, 2015/04/14 14:15:47]

Done.

+  if (status) {
+    actor_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus(
+        policy::EnrollmentStatus::STATUS_SUCCESS));
+  } else {
+    actor_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus(
+        policy::EnrollmentStatus::STATUS_DEVICE_NAMING_FAILED));
+  }
+}
+void EnrollmentScreen::ShowDeviceNamingScreen() {

[Mattias Nissler (ping if slow), 2015/04/10 12:22:28]

nit: Rename to ShowAttributePromptScreen?

[Polina Bondarenko, 2015/04/14 14:15:47]

Done.

+  actor_->ShowDeviceNamingScreen();
+}
+
 void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) {
   // TODO(achuith, zork): Extract and send domain.
   DCHECK(shark_controller_);
   shark_controller_->OnAuthenticationDone("", token);
 }
 
 void EnrollmentScreen::ShowEnrollmentStatusOnSuccess() {
   StartupUtils::MarkOobeCompleted();
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeSuccess, elapsed_timer_);
@@ skipping 14 matching lines @@
   enrollment_failed_once_ = true;
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_);
   if (remora_controller_) {
     remora_controller_->OnEnrollmentStatusChanged(
         HostPairingController::ENROLLMENT_STATUS_FAILURE);
   }
 }
 
 }  // namespace chromeos