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

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

Issue 130303004: Retrieve the authenticated user's e-mail from GAIA during SAML enrollment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix conflict between enrollment and login message handler.s Created 6 years, 11 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b99b076db1320f38044c3ba8c900e344b1f111ab..865f32424f435c20370a5e5f68fe05ef57746318 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/browsing_data/browsing_data_remover.h"
#include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.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 "components/policy/core/browser/cloud/message_util.h"
#include "content/public/browser/web_contents.h"
@@ -26,6 +27,7 @@
#include "google_apis/gaia/google_service_auth_error.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
+#include "net/url_request/url_request_context_getter.h"
#include "ui/base/l10n/l10n_util.h"
namespace {
@@ -88,6 +90,8 @@ EnrollmentScreenHandler::~EnrollmentScreenHandler() {
// EnrollmentScreenHandler, WebUIMessageHandler implementation --
void EnrollmentScreenHandler::RegisterMessages() {
+ AddCallback("oauthEnrollRetrieveAuthenticatedUserEmail",
+ &EnrollmentScreenHandler::HandleRetrieveAuthenticatedUserEmail);
AddCallback("oauthEnrollClose",
&EnrollmentScreenHandler::HandleClose);
AddCallback("oauthEnrollCompleteLogin",
@@ -328,6 +332,16 @@ void EnrollmentScreenHandler::OnBrowsingDataRemoverDone() {
// 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) {
if (!controller_) {
NOTREACHED();
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698