| 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 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 PrefService* prefs = g_browser_process->local_state(); | 781 PrefService* prefs = g_browser_process->local_state(); |
| 782 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { | 782 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { |
| 783 core_oobe_actor_->ShowDeviceResetScreen(); | 783 core_oobe_actor_->ShowDeviceResetScreen(); |
| 784 } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) { | 784 } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) { |
| 785 core_oobe_actor_->ShowEnableDebuggingScreen(); | 785 core_oobe_actor_->ShowEnableDebuggingScreen(); |
| 786 } | 786 } |
| 787 } | 787 } |
| 788 } | 788 } |
| 789 | 789 |
| 790 void GaiaScreenHandler::MaybePreloadAuthExtension() { | 790 void GaiaScreenHandler::MaybePreloadAuthExtension() { |
| 791 // TODO(rsorokin): Revert that when issue with hidden webview load will be | |
| 792 // fixed. | |
| 793 if (StartupUtils::IsWebviewSigninEnabled()) | |
| 794 return; | |
| 795 VLOG(1) << "MaybePreloadAuthExtension() call."; | 791 VLOG(1) << "MaybePreloadAuthExtension() call."; |
| 796 | 792 |
| 797 // If cookies clearing was initiated or |dns_clear_task_running_| then auth | 793 // If cookies clearing was initiated or |dns_clear_task_running_| then auth |
| 798 // extension showing has already been initiated and preloading is senseless. | 794 // extension showing has already been initiated and preloading is senseless. |
| 799 if (signin_screen_handler_->ShouldLoadGaia() && | 795 if (signin_screen_handler_->ShouldLoadGaia() && |
| 800 !gaia_silent_load_ && | 796 !gaia_silent_load_ && |
| 801 !cookies_cleared_ && | 797 !cookies_cleared_ && |
| 802 !dns_clear_task_running_ && | 798 !dns_clear_task_running_ && |
| 803 network_state_informer_->state() == NetworkStateInformer::ONLINE) { | 799 network_state_informer_->state() == NetworkStateInformer::ONLINE) { |
| 804 gaia_silent_load_ = true; | 800 gaia_silent_load_ = true; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 837 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
| 842 DCHECK(signin_screen_handler_); | 838 DCHECK(signin_screen_handler_); |
| 843 return signin_screen_handler_->delegate_; | 839 return signin_screen_handler_->delegate_; |
| 844 } | 840 } |
| 845 | 841 |
| 846 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { | 842 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { |
| 847 signin_screen_handler_ = handler; | 843 signin_screen_handler_ = handler; |
| 848 } | 844 } |
| 849 | 845 |
| 850 } // namespace chromeos | 846 } // namespace chromeos |
| OLD | NEW |