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

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

Issue 975353002: Added OOBE Asset / Naming prompt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged with master Created 5 years, 8 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 053fbf1ed564a04757b2cd43a7499f4030a2c282..07039aed3a295eaefc17bec01ea60af1e0b510bd 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -227,15 +227,59 @@ 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()));
+
+ enrollment_helper_->GetDeviceAttributeUpdatePermission();
+}
+
+void EnrollmentScreen::OnDeviceAttributeProvided(const std::string& asset_id,
+ const std::string& location) {
+ enrollment_helper_->UpdateDeviceAttributes(asset_id, location);
+}
+
+void EnrollmentScreen::OnDeviceAttributeUpdatePermission(bool granted) {
+ // If user is permitted to update device attributes
+ // Show attribute prompt screen
+ if (granted) {
+ StartupUtils::MarkDeviceRegistered(
+ base::Bind(&EnrollmentScreen::ShowAttributePromptScreen,
+ 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::OnDeviceAttributeUploadCompleted(bool success) {
+ if (success) {
+ actor_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus(
+ policy::EnrollmentStatus::STATUS_SUCCESS));
+ } else {
+ actor_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus(
+ policy::EnrollmentStatus::STATUS_ATTRIBUTE_UPDATE_FAILED));
+ }
+}
+
+void EnrollmentScreen::ShowAttributePromptScreen() {
+ policy::BrowserPolicyConnectorChromeOS* connector =
+ g_browser_process->platform_part()->browser_policy_connector_chromeos();
+ policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
+ connector->GetDeviceCloudPolicyManager();
+
+ policy::CloudPolicyStore* store = policy_manager->core()->store();
+
+ const enterprise_management::PolicyData* policy = store->policy();
+
+ std::string asset_id = policy ? policy->annotated_asset_id() : std::string();
+ std::string location = policy ? policy->annotated_location() : std::string();
+ actor_->ShowAttributePromptScreen(asset_id, location);
+}
+
void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) {
// TODO(achuith, zork): Extract and send domain.
DCHECK(shark_controller_);

Powered by Google App Engine
This is Rietveld 408576698