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

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

Issue 2677563005: Chromad: Use DM server reply to determine enrollment type (Closed)
Patch Set: comments+create ActiveDirectoryJoinDelegate 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/enrollment/enrollment_screen.h
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
index 6ccefec99d23346a24fbbc348a6d843afc5ca77c..c1536d3e2768d8695054cca634821d8b1f575661 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
@@ -16,6 +16,7 @@
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
+#include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
#include "chrome/browser/chromeos/policy/enrollment_config.h"
#include "components/policy/core/common/cloud/cloud_policy_constants.h"
#include "components/policy/core/common/cloud/enterprise_metrics.h"
@@ -38,7 +39,8 @@ class ScreenManager;
class EnrollmentScreen
: public BaseScreen,
public EnterpriseEnrollmentHelper::EnrollmentStatusConsumer,
- public EnrollmentScreenActor::Controller {
+ public EnrollmentScreenActor::Controller,
+ public ActiveDirectoryJoinDelegate {
public:
EnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
EnrollmentScreenActor* actor);
@@ -75,6 +77,9 @@ class EnrollmentScreen
void OnDeviceAttributeUploadCompleted(bool success) override;
void OnDeviceAttributeUpdatePermission(bool granted) override;
+ // ActiveDirectoryJoinDelegate implementation:
+ void JoinDomain(OnDomainJoinedCallback on_joined_callback) override;
+
// Used for testing.
EnrollmentScreenActor* GetActor() {
return actor_;
@@ -153,9 +158,9 @@ class EnrollmentScreen
Auth last_auth_ = AUTH_OAUTH;
bool enrollment_failed_once_ = false;
std::string enrolling_user_domain_;
- std::string auth_code_;
std::unique_ptr<base::ElapsedTimer> elapsed_timer_;
std::unique_ptr<EnterpriseEnrollmentHelper> enrollment_helper_;
+ OnDomainJoinedCallback on_joined_callback_;
base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);

Powered by Google App Engine
This is Rietveld 408576698