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

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

Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years 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
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 "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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 734
735 std::string active_network_path = network_state_informer_->network_path(); 735 std::string active_network_path = network_state_informer_->network_path();
736 if (gaia_silent_load_ && 736 if (gaia_silent_load_ &&
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()));
750 }
748 751
749 input_method::InputMethodManager* imm = 752 input_method::InputMethodManager* imm =
750 input_method::InputMethodManager::Get(); 753 input_method::InputMethodManager::Get();
751 754
752 scoped_refptr<input_method::InputMethodManager::State> gaia_ime_state = 755 scoped_refptr<input_method::InputMethodManager::State> gaia_ime_state =
753 imm->GetActiveIMEState()->Clone(); 756 imm->GetActiveIMEState()->Clone();
754 imm->SetState(gaia_ime_state); 757 imm->SetState(gaia_ime_state);
755 758
756 // Set Least Recently Used input method for the user. 759 // Set Least Recently Used input method for the user.
757 if (!populated_email_.empty()) { 760 if (!populated_email_.empty()) {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 bool GaiaScreenHandler::IsRestrictiveProxy() const { 880 bool GaiaScreenHandler::IsRestrictiveProxy() const {
878 return !disable_restrictive_proxy_check_for_test_ && 881 return !disable_restrictive_proxy_check_for_test_ &&
879 !IsOnline(captive_portal_status_); 882 !IsOnline(captive_portal_status_);
880 } 883 }
881 884
882 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { 885 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
883 disable_restrictive_proxy_check_for_test_ = true; 886 disable_restrictive_proxy_check_for_test_ = true;
884 } 887 }
885 888
886 } // namespace chromeos 889 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698