From da8a0ab19336a7de0ae96bdc6907c79c96409cb9 Mon Sep 17 00:00:00 2001 From: kevers Date: Fri, 3 Oct 2014 06:48:35 -0700 Subject: [PATCH] Fix VK crash on Athena login. A focus cycle during login triggers an IME change, which in turn was overriding the selected virtual keyboard. Currently, only the system VK is supported. This patch suppresses the override until IME is sufficiently supported on Athena. BUG=414940, 418078 Review URL: https://codereview.chromium.org/627443002 Cr-Commit-Position: refs/heads/master@{#298029} --- chrome/browser/chromeos/input_method/input_method_engine.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc index 00c5b4e258be..b17953770f62 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine.cc @@ -494,10 +494,19 @@ void InputMethodEngine::HideInputView() { } void InputMethodEngine::EnableInputView() { +#if defined(USE_ATHENA) + // Athena does not currently support an extension-based VK. Blocking the + // override forces Athena to use to the system fallback VK, without + // interfering with the rest of the IME system. + // TODO(shuchen|kevers): Remove override suppression once supported. + // See crbug/407579, crbug/414940 and crbug/418078. + NOTIMPLEMENTED(); +#else keyboard::SetOverrideContentUrl(input_method::InputMethodManager::Get() ->GetActiveIMEState() ->GetCurrentInputMethod() .input_view_url()); +#endif keyboard::KeyboardController* keyboard_controller = keyboard::KeyboardController::GetInstance(); if (keyboard_controller) -- 2.11.4.GIT