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 "ash/system/chromeos/devicetype_utils.h" | 7 #include "ash/system/chromeos/devicetype_utils.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/guid.h" | 9 #include "base/guid.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
737 (network_state_informer_->state() != NetworkStateInformer::ONLINE || | 737 (network_state_informer_->state() != NetworkStateInformer::ONLINE || |
738 gaia_silent_load_network_ != active_network_path)) { | 738 gaia_silent_load_network_ != active_network_path)) { |
739 // Network has changed. Force Gaia reload. | 739 // Network has changed. Force Gaia reload. |
740 gaia_silent_load_ = false; | 740 gaia_silent_load_ = false; |
741 } | 741 } |
742 | 742 |
743 // Note that LoadAuthExtension clears |populated_email_|. | 743 // Note that LoadAuthExtension clears |populated_email_|. |
744 if (populated_email_.empty()) | 744 if (populated_email_.empty()) |
745 Delegate()->LoadSigninWallpaper(); | 745 Delegate()->LoadSigninWallpaper(); |
746 else | 746 else |
747 Delegate()->LoadWallpaper(populated_email_); | 747 Delegate()->LoadWallpaper( |
748 user_manager::UserManager::Get()->GetKnownUserAccountId( | |
749 populated_email_, std::string())); | |
stevenjb
2015/12/04 17:08:53
Also, FWIW, we seem to make a fair number of GetKn
stevenjb
2015/12/04 17:08:53
{}
Alexander Alekseev
2015/12/05 06:04:47
I hope most of calls are temporary and will be rem
Alexander Alekseev
2015/12/05 06:04:47
Done.
| |
748 | 750 |
749 input_method::InputMethodManager* imm = | 751 input_method::InputMethodManager* imm = |
750 input_method::InputMethodManager::Get(); | 752 input_method::InputMethodManager::Get(); |
751 | 753 |
752 scoped_refptr<input_method::InputMethodManager::State> gaia_ime_state = | 754 scoped_refptr<input_method::InputMethodManager::State> gaia_ime_state = |
753 imm->GetActiveIMEState()->Clone(); | 755 imm->GetActiveIMEState()->Clone(); |
754 imm->SetState(gaia_ime_state); | 756 imm->SetState(gaia_ime_state); |
755 | 757 |
756 // Set Least Recently Used input method for the user. | 758 // Set Least Recently Used input method for the user. |
757 if (!populated_email_.empty()) { | 759 if (!populated_email_.empty()) { |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
877 bool GaiaScreenHandler::IsRestrictiveProxy() const { | 879 bool GaiaScreenHandler::IsRestrictiveProxy() const { |
878 return !disable_restrictive_proxy_check_for_test_ && | 880 return !disable_restrictive_proxy_check_for_test_ && |
879 !IsOnline(captive_portal_status_); | 881 !IsOnline(captive_portal_status_); |
880 } | 882 } |
881 | 883 |
882 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { | 884 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { |
883 disable_restrictive_proxy_check_for_test_ = true; | 885 disable_restrictive_proxy_check_for_test_ = true; |
884 } | 886 } |
885 | 887 |
886 } // namespace chromeos | 888 } // namespace chromeos |
OLD | NEW |