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

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

Issue 1344443002: Implement new password separated sign in flow for chrome desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/gaia_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
6 6
7 #include "ash/system/chromeos/devicetype_utils.h" 7 #include "ash/system/chromeos/devicetype_utils.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/guid.h" 9 #include "base/guid.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 202
203 base::DictionaryValue params; 203 base::DictionaryValue params;
204 const bool is_enrolling_consumer_management = 204 const bool is_enrolling_consumer_management =
205 context.is_enrolling_consumer_management; 205 context.is_enrolling_consumer_management;
206 206
207 params.SetBoolean("forceReload", context.force_reload); 207 params.SetBoolean("forceReload", context.force_reload);
208 params.SetBoolean("isLocal", context.is_local); 208 params.SetBoolean("isLocal", context.is_local);
209 params.SetBoolean("isShowUsers", context.show_users); 209 params.SetBoolean("isShowUsers", context.show_users);
210 params.SetBoolean("useOffline", context.use_offline); 210 params.SetBoolean("useOffline", context.use_offline);
211 params.SetString("gaiaId", context.gaia_id); 211 params.SetString("gaiaId", context.gaia_id);
212 params.SetBoolean("readOnlyEmail", true);
212 params.SetString("email", context.email); 213 params.SetString("email", context.email);
213 params.SetBoolean("isEnrollingConsumerManagement", 214 params.SetBoolean("isEnrollingConsumerManagement",
214 is_enrolling_consumer_management); 215 is_enrolling_consumer_management);
215 params.SetString("gapsCookie", context.gaps_cookie); 216 params.SetString("gapsCookie", context.gaps_cookie);
216 217
217 UpdateAuthParams(&params, context.has_users, is_enrolling_consumer_management, 218 UpdateAuthParams(&params, context.has_users, is_enrolling_consumer_management,
218 IsRestrictiveProxy()); 219 IsRestrictiveProxy());
219 220
220 if (!context.use_offline) { 221 if (!context.use_offline) {
221 const std::string app_locale = g_browser_process->GetApplicationLocale(); 222 const std::string app_locale = g_browser_process->GetApplicationLocale();
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 887 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
887 return signin_screen_handler_->delegate_; 888 return signin_screen_handler_->delegate_;
888 } 889 }
889 890
890 bool GaiaScreenHandler::IsRestrictiveProxy() const { 891 bool GaiaScreenHandler::IsRestrictiveProxy() const {
891 return captive_portal_status_ == 892 return captive_portal_status_ ==
892 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL; 893 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
893 } 894 }
894 895
895 } // namespace chromeos 896 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/profiles/profile_chooser_view.cc ('k') | chrome/browser/ui/webui/signin/inline_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698