OLD | NEW |
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/chromeos/input_method/input_method_engine.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_engine.h" |
6 | 6 |
7 #undef FocusIn | 7 #undef FocusIn |
8 #undef FocusOut | 8 #undef FocusOut |
9 #undef RootWindow | 9 #undef RootWindow |
10 #include <map> | 10 #include <map> |
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
459 keyboard::KeyboardController* keyboard_controller = | 459 keyboard::KeyboardController* keyboard_controller = |
460 keyboard::KeyboardController::GetInstance(); | 460 keyboard::KeyboardController::GetInstance(); |
461 if (keyboard_controller) { | 461 if (keyboard_controller) { |
462 keyboard_controller->HideKeyboard( | 462 keyboard_controller->HideKeyboard( |
463 keyboard::KeyboardController::HIDE_REASON_MANUAL); | 463 keyboard::KeyboardController::HIDE_REASON_MANUAL); |
464 } | 464 } |
465 } | 465 } |
466 | 466 |
467 void InputMethodEngine::EnableInputView() { | 467 void InputMethodEngine::EnableInputView() { |
468 keyboard::SetOverrideContentUrl(input_method::InputMethodManager::Get() | 468 keyboard::SetOverrideContentUrl(input_method::InputMethodManager::Get() |
| 469 ->GetActiveIMEState() |
469 ->GetCurrentInputMethod() | 470 ->GetCurrentInputMethod() |
470 .input_view_url()); | 471 .input_view_url()); |
471 keyboard::KeyboardController* keyboard_controller = | 472 keyboard::KeyboardController* keyboard_controller = |
472 keyboard::KeyboardController::GetInstance(); | 473 keyboard::KeyboardController::GetInstance(); |
473 if (keyboard_controller) | 474 if (keyboard_controller) |
474 keyboard_controller->Reload(); | 475 keyboard_controller->Reload(); |
475 } | 476 } |
476 | 477 |
477 void InputMethodEngine::FocusIn( | 478 void InputMethodEngine::FocusIn( |
478 const IMEEngineHandlerInterface::InputContext& input_context) { | 479 const IMEEngineHandlerInterface::InputContext& input_context) { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 // TODO(nona): Implement it. | 633 // TODO(nona): Implement it. |
633 break; | 634 break; |
634 } | 635 } |
635 } | 636 } |
636 } | 637 } |
637 | 638 |
638 // TODO(nona): Support item.children. | 639 // TODO(nona): Support item.children. |
639 } | 640 } |
640 | 641 |
641 } // namespace chromeos | 642 } // namespace chromeos |
OLD | NEW |