| 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 66d948f9df00af30af1de2f7eeaca0531858ab65..ac43e904db62fc424bd6e85011ccc7eb6fce6b85 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
|
| @@ -9,6 +9,7 @@
|
| #include "ash/common/system/chromeos/devicetype_utils.h"
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/command_line.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/strings/stringprintf.h"
|
| @@ -23,10 +24,13 @@
|
| #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
|
| #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
|
| #include "chrome/grit/generated_resources.h"
|
| +#include "chromeos/dbus/authpolicy_client.h"
|
| +#include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/network/network_state.h"
|
| #include "chromeos/network/network_state_handler.h"
|
| #include "components/login/localized_values_builder.h"
|
| #include "components/policy/core/browser/cloud/message_util.h"
|
| +#include "content/public/browser/browser_thread.h"
|
| #include "google_apis/gaia/gaia_auth_util.h"
|
| #include "google_apis/gaia/gaia_urls.h"
|
| #include "google_apis/gaia/google_service_auth_error.h"
|
| @@ -39,6 +43,7 @@ const char kJsScreenPath[] = "login.OAuthEnrollmentScreen";
|
|
|
| // Enrollment step names.
|
| const char kEnrollmentStepSignin[] = "signin";
|
| +const char kEnrollmentStepADJoin[] = "ad-join";
|
| const char kEnrollmentStepSuccess[] = "success";
|
| const char kEnrollmentStepWorking[] = "working";
|
|
|
| @@ -138,6 +143,8 @@ void EnrollmentScreenHandler::RegisterMessages() {
|
| &EnrollmentScreenHandler::HandleClose);
|
| AddCallback("oauthEnrollCompleteLogin",
|
| &EnrollmentScreenHandler::HandleCompleteLogin);
|
| + AddCallback("oauthEnrollADCompleteLogin",
|
| + &EnrollmentScreenHandler::HandleADCompleteLogin);
|
| AddCallback("oauthEnrollRetry",
|
| &EnrollmentScreenHandler::HandleRetry);
|
| AddCallback("frameLoadingCompleted",
|
| @@ -177,6 +184,11 @@ void EnrollmentScreenHandler::ShowSigninScreen() {
|
| ShowStep(kEnrollmentStepSignin);
|
| }
|
|
|
| +void EnrollmentScreenHandler::ShowADJoin() {
|
| + observe_network_failure_ = false;
|
| + ShowStep(kEnrollmentStepADJoin);
|
| +}
|
| +
|
| void EnrollmentScreenHandler::ShowAttributePromptScreen(
|
| const std::string& asset_id,
|
| const std::string& location) {
|
| @@ -385,6 +397,12 @@ void EnrollmentScreenHandler::DeclareLocalizedValues(
|
| builder->Add("oauthEnrollWorking", IDS_ENTERPRISE_ENROLLMENT_WORKING_MESSAGE);
|
| // Do not use AddF for this string as it will be rendered by the JS code.
|
| builder->Add("oauthEnrollAbeSuccess", IDS_ENTERPRISE_ENROLLMENT_ABE_SUCCESS);
|
| + builder->Add("oauthEnrollADMachineNameInput",
|
| + IDS_AD_MACHINE_NAME_INPUT_LABEL);
|
| + builder->Add("oauthEnrollADDomainJoinWelcomeMessage",
|
| + IDS_AD_DOMAIN_JOIN_WELCOME_MESSAGE);
|
| + builder->Add("ADLoginUser", IDS_AD_LOGIN_USER);
|
| + builder->Add("ADLoginPassword", IDS_AD_LOGIN_PASSWORD);
|
| }
|
|
|
| bool EnrollmentScreenHandler::IsOnEnrollmentScreen() const {
|
| @@ -514,6 +532,35 @@ void EnrollmentScreenHandler::HandleCompleteLogin(
|
| controller_->OnLoginDone(gaia::SanitizeEmail(user), auth_code);
|
| }
|
|
|
| +void EnrollmentScreenHandler::HandleADCompleteLogin(
|
| + const std::string& machine_name,
|
| + const std::string& user,
|
| + const std::string& password) {
|
| + observe_network_failure_ = false;
|
| + DCHECK(controller_);
|
| + chromeos::AuthpolicyClient* client =
|
| + chromeos::DBusThreadManager::Get()->GetAuthpolicyClient();
|
| +
|
| + client->Join(machine_name,
|
| + user,
|
| + password,
|
| + base::Bind(&EnrollmentScreenHandler::HandleADDomainJoin,
|
| + weak_ptr_factory_.GetWeakPtr(),
|
| + machine_name,
|
| + user));
|
| +}
|
| +
|
| +void EnrollmentScreenHandler::HandleADDomainJoin(
|
| + const std::string& machine_name,
|
| + const std::string& user,
|
| + int code) {
|
| + if (code == 0) {
|
| + controller_->OnADJoined(gaia::ExtractDomainName(user));
|
| + } else {
|
| + CallJS("invalidateAD", machine_name, user);
|
| + }
|
| +}
|
| +
|
| void EnrollmentScreenHandler::HandleRetry() {
|
| DCHECK(controller_);
|
| controller_->OnRetry();
|
|
|