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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 23531054: Don't switch browser locale on secondary user login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: take care of input method switch Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 4b57cf07cd9f3b7fee02dffd16caaeed60c30d43..ead5468aa7f0163183cc951eff5fd87c7249ab0d 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -1032,6 +1032,13 @@ void SigninScreenHandler::OnDnsCleared() {
// Update keyboard layout to least recently used by the user.
void SigninScreenHandler::SetUserInputMethod(const std::string& username) {
+ UserManager* user_manager = UserManager::Get();
+ if (user_manager->IsUserLoggedIn()) {
Nikita (slow) 2013/09/16 16:28:17 Ideally sign in UI should behave the same whether
Dmitry Polukhin 2013/09/16 18:30:00 Done.
+ // We are on sign-in screen inside user session (adding new user to
+ // the session or on lock screen), don't switch input methods in this case.
+ return;
+ }
+
chromeos::input_method::InputMethodManager* const manager =
chromeos::input_method::InputMethodManager::Get();
« chrome/browser/chromeos/login/login_utils.cc ('K') | « chrome/browser/ui/webui/chromeos/login/OWNERS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698