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

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

Issue 671183002: Revert of Inline sign in extracts gaia id from HTTP header and seeds account tracker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/browsing_data/browsing_data_helper.h" 18 #include "chrome/browser/browsing_data/browsing_data_helper.h"
19 #include "chrome/browser/browsing_data/browsing_data_remover.h" 19 #include "chrome/browser/browsing_data/browsing_data_remover.h"
20 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" 20 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
21 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 21 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
22 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h" 22 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
23 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" 23 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
24 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retrie ver.h"
25 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 26 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
26 #include "chrome/grit/generated_resources.h" 27 #include "chrome/grit/generated_resources.h"
27 #include "chromeos/network/network_state.h" 28 #include "chromeos/network/network_state.h"
28 #include "chromeos/network/network_state_handler.h" 29 #include "chromeos/network/network_state_handler.h"
29 #include "components/policy/core/browser/cloud/message_util.h" 30 #include "components/policy/core/browser/cloud/message_util.h"
30 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
31 #include "google_apis/gaia/gaia_auth_fetcher.h" 32 #include "google_apis/gaia/gaia_auth_fetcher.h"
32 #include "google_apis/gaia/gaia_auth_util.h" 33 #include "google_apis/gaia/gaia_auth_util.h"
33 #include "google_apis/gaia/gaia_constants.h" 34 #include "google_apis/gaia/gaia_constants.h"
34 #include "google_apis/gaia/gaia_urls.h" 35 #include "google_apis/gaia/gaia_urls.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 chromeos::WebUILoginView* login_view = 141 chromeos::WebUILoginView* login_view =
141 chromeos::LoginDisplayHostImpl::default_host()->GetWebUILoginView(); 142 chromeos::LoginDisplayHostImpl::default_host()->GetWebUILoginView();
142 if (login_view) 143 if (login_view)
143 login_view->RemoveFrameObserver(this); 144 login_view->RemoveFrameObserver(this);
144 } 145 }
145 } 146 }
146 147
147 // EnrollmentScreenHandler, WebUIMessageHandler implementation -- 148 // EnrollmentScreenHandler, WebUIMessageHandler implementation --
148 149
149 void EnrollmentScreenHandler::RegisterMessages() { 150 void EnrollmentScreenHandler::RegisterMessages() {
151 AddCallback("oauthEnrollRetrieveAuthenticatedUserEmail",
152 &EnrollmentScreenHandler::HandleRetrieveAuthenticatedUserEmail);
150 AddCallback("oauthEnrollClose", 153 AddCallback("oauthEnrollClose",
151 &EnrollmentScreenHandler::HandleClose); 154 &EnrollmentScreenHandler::HandleClose);
152 AddCallback("oauthEnrollCompleteLogin", 155 AddCallback("oauthEnrollCompleteLogin",
153 &EnrollmentScreenHandler::HandleCompleteLogin); 156 &EnrollmentScreenHandler::HandleCompleteLogin);
154 AddCallback("oauthEnrollRetry", 157 AddCallback("oauthEnrollRetry",
155 &EnrollmentScreenHandler::HandleRetry); 158 &EnrollmentScreenHandler::HandleRetry);
156 AddCallback("frameLoadingCompleted", 159 AddCallback("frameLoadingCompleted",
157 &EnrollmentScreenHandler::HandleFrameLoadingCompleted); 160 &EnrollmentScreenHandler::HandleFrameLoadingCompleted);
158 } 161 }
159 162
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 } 512 }
510 513
511 void EnrollmentScreenHandler::OnFrameError( 514 void EnrollmentScreenHandler::OnFrameError(
512 const std::string& frame_unique_name) { 515 const std::string& frame_unique_name) {
513 if (frame_unique_name == "oauth-enroll-signin-frame") { 516 if (frame_unique_name == "oauth-enroll-signin-frame") {
514 HandleFrameLoadingCompleted(net::ERR_FAILED); 517 HandleFrameLoadingCompleted(net::ERR_FAILED);
515 } 518 }
516 } 519 }
517 // EnrollmentScreenHandler, private ----------------------------- 520 // EnrollmentScreenHandler, private -----------------------------
518 521
522 void EnrollmentScreenHandler::HandleRetrieveAuthenticatedUserEmail(
523 double attempt_token) {
524 email_retriever_.reset(new AuthenticatedUserEmailRetriever(
525 base::Bind(&EnrollmentScreenHandler::CallJS<double, std::string>,
526 base::Unretained(this),
527 "setAuthenticatedUserEmail",
528 attempt_token),
529 Profile::FromWebUI(web_ui())->GetRequestContext()));
530 }
531
519 void EnrollmentScreenHandler::HandleClose(const std::string& reason) { 532 void EnrollmentScreenHandler::HandleClose(const std::string& reason) {
520 DCHECK(controller_); 533 DCHECK(controller_);
521 534
522 if (reason == "cancel" || reason == "autocancel") 535 if (reason == "cancel" || reason == "autocancel")
523 controller_->OnCancel(); 536 controller_->OnCancel();
524 else if (reason == "done") 537 else if (reason == "done")
525 controller_->OnConfirmationClosed(); 538 controller_->OnConfirmationClosed();
526 else 539 else
527 NOTREACHED(); 540 NOTREACHED();
528 } 541 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 screen_data.SetString("gaiaUrl", GaiaUrls::GetInstance()->gaia_url().spec()); 599 screen_data.SetString("gaiaUrl", GaiaUrls::GetInstance()->gaia_url().spec());
587 screen_data.SetString("enrollment_mode", 600 screen_data.SetString("enrollment_mode",
588 EnrollmentModeToString(enrollment_mode_)); 601 EnrollmentModeToString(enrollment_mode_));
589 screen_data.SetString("management_domain", management_domain_); 602 screen_data.SetString("management_domain", management_domain_);
590 603
591 ShowScreen(OobeUI::kScreenOobeEnrollment, &screen_data); 604 ShowScreen(OobeUI::kScreenOobeEnrollment, &screen_data);
592 histogram_helper_->OnScreenShow(); 605 histogram_helper_->OnScreenShow();
593 } 606 }
594 607
595 } // namespace chromeos 608 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698