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

Unified Diff: chrome/browser/chromeos/login/screens/host_pairing_screen.cc

Issue 2677563005: Chromad: Use DM server reply to determine enrollment type (Closed)
Patch Set: Thiemo's comments Created 3 years, 10 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/screens/host_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
index 402cabbf36392fe4b95a34aa2703eea07219f510..22d8018efb65eb71c58a0b7795fc92502050668b 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
+#include "chrome/browser/chromeos/policy/fake_active_directory_join_delegate.h"
#include "components/pairing/host_pairing_controller.h"
namespace chromeos {
@@ -26,7 +27,6 @@ HostPairingScreen::HostPairingScreen(
delegate_(delegate),
actor_(actor),
remora_controller_(remora_controller),
- current_stage_(HostPairingController::STAGE_NONE),
weak_ptr_factory_(this) {
actor_->SetDelegate(this);
remora_controller_->AddObserver(this);
@@ -145,8 +145,9 @@ void HostPairingScreen::EnrollHostRequested(const std::string& auth_token) {
g_browser_process->platform_part()
->browser_policy_connector_chromeos()
->GetPrescribedEnrollmentConfig();
+ fake_ad_join_delegate_ = base::MakeUnique<FakeActiveDirectoryJoinDelegate>();
enrollment_helper_ = EnterpriseEnrollmentHelper::Create(
- this, enrollment_config, std::string());
+ this, fake_ad_join_delegate_.get(), enrollment_config, std::string());
Thiemo Nagel 2017/02/14 16:43:06 Maybe I'm missing something, but couldn't you just
Roman Sorokin (ftl) 2017/02/15 14:01:44 Done.
enrollment_helper_->EnrollUsingToken(auth_token);
remora_controller_->OnEnrollmentStatusChanged(
HostPairingController::ENROLLMENT_STATUS_ENROLLING);

Powered by Google App Engine
This is Rietveld 408576698