Chromad: Use DM server reply to determine enrollment type

chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.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/ui/webui/chromeos/login/enrollment_screen_handler.h"
 
 #include <algorithm>
 
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "base/bind.h"
@@ skipping 168 matching lines @@
 }
 
 void EnrollmentScreenHandler::Hide() {
 }
 
 void EnrollmentScreenHandler::ShowSigninScreen() {
   observe_network_failure_ = true;
   ShowStep(kEnrollmentStepSignin);
 }
 
-void EnrollmentScreenHandler::ShowAdJoin() {
+void EnrollmentScreenHandler::ShowAdJoin(
+    OnAdJoinedCallback on_joined_callback) {
+  on_joined_callback_ = std::move(on_joined_callback);
   observe_network_failure_ = false;
   ShowStep(kEnrollmentStepAdJoin);
 }
 
 void EnrollmentScreenHandler::ShowAttributePromptScreen(
     const std::string& asset_id,
     const std::string& location) {
   CallJS("showAttributePromptStep", asset_id, location);
 }
 
@@ skipping 371 matching lines @@
                                   machine_name,
                                   user_name));
 }
 
 void EnrollmentScreenHandler::HandleAdDomainJoin(
     const std::string& machine_name,
     const std::string& user_name,
     authpolicy::ErrorType code) {
   switch (code) {
     case authpolicy::ERROR_NONE:
-      controller_->OnAdJoined(gaia::ExtractDomainName(user_name));
+      ShowEnrollmentSpinnerScreen();
+      std::move(on_joined_callback_).Run(gaia::ExtractDomainName(user_name));

[achuithb, 2017/02/07 20:27:17]

Is this your way of setting on_joined_callback_ to null? I don't think we should
use std::move here.

[Roman Sorokin (ftl), 2017/02/10 14:57:10]

This is the way to consume OnceCallbacks according to 
https://cs.chromium.org/chromium/src/docs/callback.md

[achuithb, 2017/02/13 13:39:02]

Acknowledged.

       return;
     case authpolicy::ERROR_UNKNOWN:
     case authpolicy::ERROR_DBUS_FAILURE:
     case authpolicy::ERROR_NET_FAILED:
     case authpolicy::ERROR_SMBCLIENT_FAILED:
     case authpolicy::ERROR_PARSE_FAILED:
     case authpolicy::ERROR_PARSE_PREG_FAILED:
     case authpolicy::ERROR_BAD_GPOS:
     case authpolicy::ERROR_LOCAL_IO:
     case authpolicy::ERROR_STORE_POLICY_FAILED:
@@ skipping 100 matching lines @@
 
   ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data);
   if (first_show_) {
     first_show_ = false;
     UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true);
   }
   histogram_helper_->OnScreenShow();
 }
 
 }  // namespace chromeos