OLD | NEW |
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 Loading... |
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("whitelistErrorConsumer", IDS_LOGIN_ERROR_WHITELIST); |
| 328 builder->Add("whitelistErrorEnterprise", |
| 329 IDS_ENTERPRISE_LOGIN_ERROR_WHITELIST); |
| 330 builder->Add("tryAgainButton", IDS_WHITELIST_ERROR_TRY_AGAIN_BUTTON); |
| 331 builder->Add("learnMoreButton", IDS_WHITELIST_ERROR_LEARN_MORE_BUTTON); |
327 builder->Add("gaiaLoadingNewGaia", IDS_LOGIN_GAIA_LOADING_MESSAGE); | 332 builder->Add("gaiaLoadingNewGaia", IDS_LOGIN_GAIA_LOADING_MESSAGE); |
328 | 333 |
329 // Strings used by the SAML fatal error dialog. | 334 // Strings used by the SAML fatal error dialog. |
330 builder->Add("fatalErrorMessageNoAccountDetails", | 335 builder->Add("fatalErrorMessageNoAccountDetails", |
331 IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS); | 336 IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS); |
332 builder->Add("fatalErrorMessageNoPassword", | 337 builder->Add("fatalErrorMessageNoPassword", |
333 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD); | 338 IDS_LOGIN_FATAL_ERROR_NO_PASSWORD); |
334 builder->Add("fatalErrorMessageVerificationFailed", | 339 builder->Add("fatalErrorMessageVerificationFailed", |
335 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION); | 340 IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION); |
336 builder->Add("fatalErrorMessageInsecureURL", | 341 builder->Add("fatalErrorMessageInsecureURL", |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
831 !gaia_silent_load_ && | 836 !gaia_silent_load_ && |
832 !cookies_cleared_ && | 837 !cookies_cleared_ && |
833 !dns_clear_task_running_ && | 838 !dns_clear_task_running_ && |
834 network_state_informer_->state() == NetworkStateInformer::ONLINE) { | 839 network_state_informer_->state() == NetworkStateInformer::ONLINE) { |
835 gaia_silent_load_ = true; | 840 gaia_silent_load_ = true; |
836 gaia_silent_load_network_ = network_state_informer_->network_path(); | 841 gaia_silent_load_network_ = network_state_informer_->network_path(); |
837 LoadAuthExtension(true, true, false); | 842 LoadAuthExtension(true, true, false); |
838 } | 843 } |
839 } | 844 } |
840 | 845 |
| 846 void GaiaScreenHandler::ShowWhitelistCheckFailedError() { |
| 847 base::DictionaryValue params; |
| 848 params.SetBoolean("enterpriseManaged", |
| 849 g_browser_process->platform_part() |
| 850 ->browser_policy_connector_chromeos() |
| 851 ->IsEnterpriseManaged()); |
| 852 CallJS("showWhitelistCheckFailedError", true, params); |
| 853 } |
| 854 |
841 void GaiaScreenHandler::LoadAuthExtension(bool force, | 855 void GaiaScreenHandler::LoadAuthExtension(bool force, |
842 bool silent_load, | 856 bool silent_load, |
843 bool offline) { | 857 bool offline) { |
844 GaiaContext context; | 858 GaiaContext context; |
845 context.force_reload = force; | 859 context.force_reload = force; |
846 context.is_local = offline; | 860 context.is_local = offline; |
847 context.password_changed = !populated_email_.empty() && | 861 context.password_changed = !populated_email_.empty() && |
848 password_changed_for_.count(populated_email_); | 862 password_changed_for_.count(populated_email_); |
849 context.use_offline = offline; | 863 context.use_offline = offline; |
850 context.email = populated_email_; | 864 context.email = populated_email_; |
(...skipping 21 matching lines...) Expand all Loading... |
872 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 886 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
873 DCHECK(signin_screen_handler_); | 887 DCHECK(signin_screen_handler_); |
874 return signin_screen_handler_->delegate_; | 888 return signin_screen_handler_->delegate_; |
875 } | 889 } |
876 | 890 |
877 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { | 891 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { |
878 signin_screen_handler_ = handler; | 892 signin_screen_handler_ = handler; |
879 } | 893 } |
880 | 894 |
881 } // namespace chromeos | 895 } // namespace chromeos |
OLD | NEW |