| Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| index f7a7ddd315e5bcb7772f8e1364f7810f4e5d0734..db8dec1d4ad2ef6ed2f24b3276b7ae68c6fddf1a 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| @@ -877,8 +877,13 @@ void GaiaScreenHandler::ShowGaiaScreenIfReady() {
|
| SigninScreenHandler::SetUserInputMethod(populated_email_,
|
| gaia_ime_state.get());
|
| } else {
|
| - std::vector<std::string> input_methods =
|
| - imm->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
|
| + std::vector<std::string> input_methods;
|
| + if (gaia_ime_state->GetAllowedInputMethods().empty()) {
|
| + input_methods =
|
| + imm->GetInputMethodUtil()->GetHardwareLoginInputMethodIds();
|
| + } else {
|
| + input_methods = gaia_ime_state->GetAllowedInputMethods();
|
| + }
|
| const std::string owner_im = SigninScreenHandler::GetUserLastInputMethod(
|
| user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail());
|
| const std::string system_im = g_browser_process->local_state()->GetString(
|
|
|