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

Unified Diff: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

Issue 2677563005: Chromad: Use DM server reply to determine enrollment type (Closed)
Patch Set: 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/ui/webui/chromeos/login/enrollment_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
index 2b4a49d805dfefa6b4dc2ff46f2ca94717b917fd..33204dc52a01a85b0a31220e05ec7ab1234d62e7 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -186,7 +186,9 @@ void EnrollmentScreenHandler::ShowSigninScreen() {
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);
}
@@ -578,7 +580,8 @@ void EnrollmentScreenHandler::HandleAdDomainJoin(
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
Roman Sorokin (ftl) 2017/02/10 14:57:10 This is the way to consume OnceCallbacks according
achuithb 2017/02/13 13:39:02 Acknowledged.
return;
case authpolicy::ERROR_UNKNOWN:
case authpolicy::ERROR_DBUS_FAILURE:

Powered by Google App Engine
This is Rietveld 408576698