Inline sign in extracts gaia id from HTTP header and seeds account tracker

chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
-#include "base/bind_helpers.h"

[bartfab (slow), 2014/10/21 14:47:47]

Nit: This is still used in EnrollmentScreenHandler::FetchOAuthToken().

[Roger Tawa OOO till Jul 10th, 2014/10/21 19:15:31]

Done.

 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/policy/core/browser/cloud/message_util.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "net/url_request/url_request_context_getter.h"

[bartfab (slow), 2014/10/21 14:47:47]

Nit: This is still used in EnrollmentScreenHandler::FetchOAuthToken().

[Roger Tawa OOO till Jul 10th, 2014/10/21 19:15:31]

Done.

 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 namespace {
 
 const char kJsScreenPath[] = "login.OAuthEnrollmentScreen";
 
 // Enrollment step names.
 const char kEnrollmentStepSignin[] = "signin";
 const char kEnrollmentStepSuccess[] = "success";
@@ skipping 92 matching lines @@
     chromeos::WebUILoginView* login_view =
         chromeos::LoginDisplayHostImpl::default_host()->GetWebUILoginView();
     if (login_view)
       login_view->RemoveFrameObserver(this);
   }
 }
 
 // EnrollmentScreenHandler, WebUIMessageHandler implementation --
 
 void EnrollmentScreenHandler::RegisterMessages() {
-  AddCallback("oauthEnrollRetrieveAuthenticatedUserEmail",
-              &EnrollmentScreenHandler::HandleRetrieveAuthenticatedUserEmail);
   AddCallback("oauthEnrollClose",
               &EnrollmentScreenHandler::HandleClose);
   AddCallback("oauthEnrollCompleteLogin",
               &EnrollmentScreenHandler::HandleCompleteLogin);
   AddCallback("oauthEnrollRetry",
               &EnrollmentScreenHandler::HandleRetry);
   AddCallback("frameLoadingCompleted",
               &EnrollmentScreenHandler::HandleFrameLoadingCompleted);
 }
 
@@ skipping 347 matching lines @@
 }
 
 void EnrollmentScreenHandler::OnFrameError(
     const std::string& frame_unique_name) {
   if (frame_unique_name == "oauth-enroll-signin-frame") {
     HandleFrameLoadingCompleted(net::ERR_FAILED);
   }
 }
 // EnrollmentScreenHandler, private -----------------------------
 
-void EnrollmentScreenHandler::HandleRetrieveAuthenticatedUserEmail(
-    double attempt_token) {
-  email_retriever_.reset(new AuthenticatedUserEmailRetriever(
-      base::Bind(&EnrollmentScreenHandler::CallJS<double, std::string>,
-                 base::Unretained(this),
-                 "setAuthenticatedUserEmail",
-                 attempt_token),
-      Profile::FromWebUI(web_ui())->GetRequestContext()));
-}
-
 void EnrollmentScreenHandler::HandleClose(const std::string& reason) {
   DCHECK(controller_);
 
   if (reason == "cancel" || reason == "autocancel")
     controller_->OnCancel();
   else if (reason == "done")
     controller_->OnConfirmationClosed();
   else
     NOTREACHED();
 }
@@ skipping 56 matching lines @@
       base::StringPrintf("%s/main.html", extensions::kGaiaAuthExtensionOrigin));
   screen_data.SetString("gaiaUrl", GaiaUrls::GetInstance()->gaia_url().spec());
   screen_data.SetString("enrollment_mode",
                         EnrollmentModeToString(enrollment_mode_));
   screen_data.SetString("management_domain", management_domain_);
 
   ShowScreen(OobeUI::kScreenOobeEnrollment, &screen_data);
 }
 
 }  // namespace chromeos