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

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

Issue 2723083003: Rename LRU Input Method to Last Input Method (Closed)
Patch Set: Rebase. Created 3 years, 9 months 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/common/system/chromeos/devicetype_utils.h" 7 #include "ash/common/system/chromeos/devicetype_utils.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/guid.h" 10 #include "base/guid.h"
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 imm->GetActiveIMEState()->Clone(); 873 imm->GetActiveIMEState()->Clone();
874 imm->SetState(gaia_ime_state); 874 imm->SetState(gaia_ime_state);
875 875
876 // Set Least Recently Used input method for the user. 876 // Set Least Recently Used input method for the user.
877 if (!populated_email_.empty()) { 877 if (!populated_email_.empty()) {
878 SigninScreenHandler::SetUserInputMethod(populated_email_, 878 SigninScreenHandler::SetUserInputMethod(populated_email_,
879 gaia_ime_state.get()); 879 gaia_ime_state.get());
880 } else { 880 } else {
881 std::vector<std::string> input_methods = 881 std::vector<std::string> input_methods =
882 imm->GetInputMethodUtil()->GetHardwareLoginInputMethodIds(); 882 imm->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
883 const std::string owner_im = SigninScreenHandler::GetUserLRUInputMethod( 883 const std::string owner_im = SigninScreenHandler::GetUserLastInputMethod(
884 user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail()); 884 user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail());
885 const std::string system_im = g_browser_process->local_state()->GetString( 885 const std::string system_im = g_browser_process->local_state()->GetString(
886 language_prefs::kPreferredKeyboardLayout); 886 language_prefs::kPreferredKeyboardLayout);
887 887
888 PushFrontIMIfNotExists(owner_im, &input_methods); 888 PushFrontIMIfNotExists(owner_im, &input_methods);
889 PushFrontIMIfNotExists(system_im, &input_methods); 889 PushFrontIMIfNotExists(system_im, &input_methods);
890 890
891 gaia_ime_state->EnableLoginLayouts( 891 gaia_ime_state->EnableLoginLayouts(
892 g_browser_process->GetApplicationLocale(), input_methods); 892 g_browser_process->GetApplicationLocale(), input_methods);
893 893
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 970 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
971 return signin_screen_handler_->delegate_; 971 return signin_screen_handler_->delegate_;
972 } 972 }
973 973
974 bool GaiaScreenHandler::IsRestrictiveProxy() const { 974 bool GaiaScreenHandler::IsRestrictiveProxy() const {
975 return !disable_restrictive_proxy_check_for_test_ && 975 return !disable_restrictive_proxy_check_for_test_ &&
976 !IsOnline(captive_portal_status_); 976 !IsOnline(captive_portal_status_);
977 } 977 }
978 978
979 } // namespace chromeos 979 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698