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

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

Issue 1029053002: Back button for the WebView-based sign-in flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit. Created 5 years, 9 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
« no previous file with comments | « chrome/browser/resources/gaia_auth_host/authenticator.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 builder->Add("signinScreenPasswordChanged", 325 builder->Add("signinScreenPasswordChanged",
326 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED); 326 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED);
327 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); 327 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
328 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); 328 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
329 builder->Add("createSupervisedUser", 329 builder->Add("createSupervisedUser",
330 IDS_CREATE_SUPERVISED_USER_HTML); 330 IDS_CREATE_SUPERVISED_USER_HTML);
331 builder->Add("createSupervisedUserFeatureName", 331 builder->Add("createSupervisedUserFeatureName",
332 IDS_CREATE_SUPERVISED_USER_FEATURE_NAME); 332 IDS_CREATE_SUPERVISED_USER_FEATURE_NAME);
333 builder->Add("consumerManagementEnrollmentSigninMessage", 333 builder->Add("consumerManagementEnrollmentSigninMessage",
334 IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT); 334 IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT);
335 builder->Add("backButton", IDS_ACCNAME_BACK);
335 builder->Add("closeButton", IDS_CLOSE); 336 builder->Add("closeButton", IDS_CLOSE);
336 337
337 // Strings used by the SAML fatal error dialog. 338 // Strings used by the SAML fatal error dialog.
338 builder->Add("fatalErrorMessageNoAccountDetails", 339 builder->Add("fatalErrorMessageNoAccountDetails",
339 IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS); 340 IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS);
340 builder->Add("fatalErrorMessageNoPassword", 341 builder->Add("fatalErrorMessageNoPassword",
341 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD); 342 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD);
342 builder->Add("fatalErrorMessageVerificationFailed", 343 builder->Add("fatalErrorMessageVerificationFailed",
343 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION); 344 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION);
344 builder->Add("fatalErrorMessageInsecureURL", 345 builder->Add("fatalErrorMessageInsecureURL",
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 821 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
821 DCHECK(signin_screen_handler_); 822 DCHECK(signin_screen_handler_);
822 return signin_screen_handler_->delegate_; 823 return signin_screen_handler_->delegate_;
823 } 824 }
824 825
825 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 826 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
826 signin_screen_handler_ = handler; 827 signin_screen_handler_ = handler;
827 } 828 }
828 829
829 } // namespace chromeos 830 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/gaia_auth_host/authenticator.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698