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

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

Issue 2677563005: Chromad: Use DM server reply to determine enrollment type (Closed)
Patch Set: comment+rebase+fix test 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.h
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.h b/chrome/browser/chromeos/login/screens/host_pairing_screen.h
index b209d5d30c2243f11d43b13a14341f6180bd096b..50583be50432fb64d4a6905fef1e84cf2e43f85d 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.h
@@ -9,6 +9,7 @@
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
#include "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h"
+#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
#include "components/login/screens/screen_context.h"
#include "components/pairing/host_pairing_controller.h"
@@ -18,7 +19,8 @@ class HostPairingScreen
: public BaseScreen,
public pairing_chromeos::HostPairingController::Observer,
public HostPairingScreenActor::Delegate,
- public EnterpriseEnrollmentHelper::EnrollmentStatusConsumer {
+ public EnterpriseEnrollmentHelper::EnrollmentStatusConsumer,
+ public ActiveDirectoryJoinDelegate {
public:
class Delegate {
public:
@@ -73,21 +75,24 @@ class HostPairingScreen
void OnDeviceAttributeUploadCompleted(bool success) override;
void OnDeviceAttributeUpdatePermission(bool granted) override;
+ // Overriden from ActiveDirectoryJoinDelegate:
Thiemo Nagel 2017/02/14 14:45:00 Nit: Overridden
Roman Sorokin (ftl) 2017/02/14 16:01:33 Done.
+ void JoinDomain(OnDomainJoinedCallback on_joined_callback) override;
+
// Used as a callback for EnterpriseEnrollmentHelper::ClearAuth.
void OnAuthCleared();
void OnAnyEnrollmentError();
- Delegate* delegate_;
+ Delegate* delegate_ = nullptr;
- HostPairingScreenActor* actor_;
+ HostPairingScreenActor* actor_ = nullptr;
// Controller performing pairing. Owned by the wizard controller.
- pairing_chromeos::HostPairingController* remora_controller_;
+ pairing_chromeos::HostPairingController* remora_controller_ = nullptr;
std::unique_ptr<EnterpriseEnrollmentHelper> enrollment_helper_;
// Current stage of pairing process.
- Stage current_stage_;
+ Stage current_stage_ = pairing_chromeos::HostPairingController::STAGE_NONE;
base::WeakPtrFactory<HostPairingScreen> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698