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 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
464 keyboard::KeyboardController* keyboard_controller = | 464 keyboard::KeyboardController* keyboard_controller = |
465 keyboard::KeyboardController::GetInstance(); | 465 keyboard::KeyboardController::GetInstance(); |
466 if (keyboard_controller) { | 466 if (keyboard_controller) { |
467 keyboard_controller->HideKeyboard( | 467 keyboard_controller->HideKeyboard( |
468 keyboard::KeyboardController::HIDE_REASON_MANUAL); | 468 keyboard::KeyboardController::HIDE_REASON_MANUAL); |
469 } | 469 } |
470 } | 470 } |
471 | 471 |
472 void InputMethodEngine::EnableInputView() { | 472 void InputMethodEngine::EnableInputView() { |
473 keyboard::SetOverrideContentUrl(input_method::InputMethodManager::Get() | 473 keyboard::SetOverrideContentUrl(input_method::InputMethodManager::Get() |
| 474 ->GetActiveIMEState() |
474 ->GetCurrentInputMethod() | 475 ->GetCurrentInputMethod() |
475 .input_view_url()); | 476 .input_view_url()); |
476 keyboard::KeyboardController* keyboard_controller = | 477 keyboard::KeyboardController* keyboard_controller = |
477 keyboard::KeyboardController::GetInstance(); | 478 keyboard::KeyboardController::GetInstance(); |
478 if (keyboard_controller) | 479 if (keyboard_controller) |
479 keyboard_controller->Reload(); | 480 keyboard_controller->Reload(); |
480 } | 481 } |
481 | 482 |
482 void InputMethodEngine::FocusIn( | 483 void InputMethodEngine::FocusIn( |
483 const IMEEngineHandlerInterface::InputContext& input_context) { | 484 const IMEEngineHandlerInterface::InputContext& input_context) { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 // TODO(nona): Implement it. | 638 // TODO(nona): Implement it. |
638 break; | 639 break; |
639 } | 640 } |
640 } | 641 } |
641 } | 642 } |
642 | 643 |
643 // TODO(nona): Support item.children. | 644 // TODO(nona): Support item.children. |
644 } | 645 } |
645 | 646 |
646 } // namespace chromeos | 647 } // namespace chromeos |
OLD | NEW |