| Index: chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
|
| index 9c0dff9ec946f101807391f9f2dda86860f3b674..4d10a0722b33480a066487fd570abd1648e1e423 100644
|
| --- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
|
| @@ -8,13 +8,16 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/chromeos/login/wizard_controller.h"
|
| #include "chromeos/chromeos_switches.h"
|
| -#include "chromeos/login/auth/user_context.h"
|
| #include "components/pairing/fake_controller_pairing_controller.h"
|
| #include "google_apis/gaia/gaia_auth_util.h"
|
|
|
| using namespace chromeos::controller_pairing;
|
| using namespace pairing_chromeos;
|
|
|
| +namespace {
|
| +const char* kTestAuthToken = "TestAuthToken";
|
| +};
|
| +
|
| namespace chromeos {
|
|
|
| ControllerPairingScreen::ControllerPairingScreen(
|
| @@ -197,13 +200,12 @@ void ControllerPairingScreen::OnUserActed(const std::string& action) {
|
| context_.SetString(kContextKeyPage, kPageAuthentication);
|
| disable_controls = false;
|
| } else if (action == kActionEnroll) {
|
| - std::string account_id =
|
| + const std::string account_id =
|
| gaia::SanitizeEmail(context_.GetString(kContextKeyAccountId));
|
| - context_.SetString(kContextKeyEnrollmentDomain,
|
| - gaia::ExtractDomainName(account_id));
|
| - UserContext user_context(account_id);
|
| - controller_->OnAuthenticationDone(user_context,
|
| - actor_->GetBrowserContext());
|
| + const std::string domain(gaia::ExtractDomainName(account_id));
|
| + context_.SetString(kContextKeyEnrollmentDomain, domain);
|
| + // TODO(zork): Get proper credentials. (http://crbug.com/405744)
|
| + controller_->OnAuthenticationDone(domain, kTestAuthToken);
|
| } else if (action == kActionStartSession) {
|
| controller_->StartSession();
|
| }
|
|
|