| 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 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 814 !gaia_silent_load_ && | 819 !gaia_silent_load_ && |
| 815 !cookies_cleared_ && | 820 !cookies_cleared_ && |
| 816 !dns_clear_task_running_ && | 821 !dns_clear_task_running_ && |
| 817 network_state_informer_->state() == NetworkStateInformer::ONLINE) { | 822 network_state_informer_->state() == NetworkStateInformer::ONLINE) { |
| 818 gaia_silent_load_ = true; | 823 gaia_silent_load_ = true; |
| 819 gaia_silent_load_network_ = network_state_informer_->network_path(); | 824 gaia_silent_load_network_ = network_state_informer_->network_path(); |
| 820 LoadAuthExtension(true, true, false); | 825 LoadAuthExtension(true, true, false); |
| 821 } | 826 } |
| 822 } | 827 } |
| 823 | 828 |
| 829 void GaiaScreenHandler::ShowWhitelistCheckFailedError() { |
| 830 base::DictionaryValue params; |
| 831 params.SetBoolean("enterpriseManaged", |
| 832 g_browser_process->platform_part() |
| 833 ->browser_policy_connector_chromeos() |
| 834 ->IsEnterpriseManaged()); |
| 835 CallJS("showWhitelistCheckFailedError", true, params); |
| 836 } |
| 837 |
| 824 void GaiaScreenHandler::LoadAuthExtension(bool force, | 838 void GaiaScreenHandler::LoadAuthExtension(bool force, |
| 825 bool silent_load, | 839 bool silent_load, |
| 826 bool offline) { | 840 bool offline) { |
| 827 GaiaContext context; | 841 GaiaContext context; |
| 828 context.force_reload = force; | 842 context.force_reload = force; |
| 829 context.is_local = offline; | 843 context.is_local = offline; |
| 830 context.password_changed = !populated_email_.empty() && | 844 context.password_changed = !populated_email_.empty() && |
| 831 password_changed_for_.count(populated_email_); | 845 password_changed_for_.count(populated_email_); |
| 832 context.use_offline = offline; | 846 context.use_offline = offline; |
| 833 context.email = populated_email_; | 847 context.email = populated_email_; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 855 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 869 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
| 856 DCHECK(signin_screen_handler_); | 870 DCHECK(signin_screen_handler_); |
| 857 return signin_screen_handler_->delegate_; | 871 return signin_screen_handler_->delegate_; |
| 858 } | 872 } |
| 859 | 873 |
| 860 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { | 874 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { |
| 861 signin_screen_handler_ = handler; | 875 signin_screen_handler_ = handler; |
| 862 } | 876 } |
| 863 | 877 |
| 864 } // namespace chromeos | 878 } // namespace chromeos |
| OLD | NEW |