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

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

Issue 1064663002: Gaia loading screen changed to align with new Sync screen UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: register element only once Created 5 years, 8 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/chromeos/login/throbber_notice.html ('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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); 317 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
318 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML); 318 builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
319 builder->Add("createSupervisedUser", 319 builder->Add("createSupervisedUser",
320 IDS_CREATE_SUPERVISED_USER_HTML); 320 IDS_CREATE_SUPERVISED_USER_HTML);
321 builder->Add("createSupervisedUserFeatureName", 321 builder->Add("createSupervisedUserFeatureName",
322 IDS_CREATE_SUPERVISED_USER_FEATURE_NAME); 322 IDS_CREATE_SUPERVISED_USER_FEATURE_NAME);
323 builder->Add("consumerManagementEnrollmentSigninMessage", 323 builder->Add("consumerManagementEnrollmentSigninMessage",
324 IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT); 324 IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT);
325 builder->Add("backButton", IDS_ACCNAME_BACK); 325 builder->Add("backButton", IDS_ACCNAME_BACK);
326 builder->Add("closeButton", IDS_CLOSE); 326 builder->Add("closeButton", IDS_CLOSE);
327 builder->Add("gaiaLoadingNewGaia", IDS_LOGIN_GAIA_LOADING_MESSAGE);
327 328
328 // Strings used by the SAML fatal error dialog. 329 // Strings used by the SAML fatal error dialog.
329 builder->Add("fatalErrorMessageNoAccountDetails", 330 builder->Add("fatalErrorMessageNoAccountDetails",
330 IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS); 331 IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS);
331 builder->Add("fatalErrorMessageNoPassword", 332 builder->Add("fatalErrorMessageNoPassword",
332 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD); 333 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD);
333 builder->Add("fatalErrorMessageVerificationFailed", 334 builder->Add("fatalErrorMessageVerificationFailed",
334 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION); 335 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION);
335 builder->Add("fatalErrorMessageInsecureURL", 336 builder->Add("fatalErrorMessageInsecureURL",
336 IDS_LOGIN_FATAL_ERROR_TEXT_INSECURE_URL); 337 IDS_LOGIN_FATAL_ERROR_TEXT_INSECURE_URL);
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 855 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
855 DCHECK(signin_screen_handler_); 856 DCHECK(signin_screen_handler_);
856 return signin_screen_handler_->delegate_; 857 return signin_screen_handler_->delegate_;
857 } 858 }
858 859
859 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 860 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
860 signin_screen_handler_ = handler; 861 signin_screen_handler_ = handler;
861 } 862 }
862 863
863 } // namespace chromeos 864 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/throbber_notice.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698