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 38e6c601783cbbf697bf438379df6c1fc107d16d..40d45937123b42c91e533002a1cb87130289ebd3 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
@@ -216,14 +216,16 @@ static bool SetUserInputMethodImpl( |
return false; |
} |
- if (!Contains(manager->GetActiveInputMethodIds(), input_method)) { |
- if (!manager->EnableInputMethod(input_method)) { |
+ if (!Contains(manager->GetActiveIMEState()->GetActiveInputMethodIds(), |
+ input_method)) { |
+ if (!manager->GetActiveIMEState()->EnableInputMethod(input_method)) { |
DLOG(ERROR) << "SigninScreenHandler::SetUserInputMethod('" << username |
<< "'): user input method '" << input_method |
<< "' is not enabled and enabling failed (ignored!)."; |
} |
} |
- manager->ChangeInputMethod(input_method); |
+ manager->GetActiveIMEState()->ChangeInputMethod(input_method, |
+ false /* show_message */); |
return true; |
} |
@@ -1018,7 +1020,7 @@ void SigninScreenHandler::SetUserInputMethod(const std::string& username) { |
DVLOG(0) << "SetUserInputMethod('" << username |
<< "'): failed to set user layout. Switching to default."; |
- manager->SetInputMethodLoginDefault(); |
+ manager->GetActiveIMEState()->SetInputMethodLoginDefault(); |
} |
} |