OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/html_viewer/ime_controller.h" | 5 #include "components/html_viewer/ime_controller.h" |
6 | 6 |
7 #include "components/html_viewer/blink_input_events_type_converters.h" | |
8 #include "components/html_viewer/blink_text_input_type_converters.h" | 7 #include "components/html_viewer/blink_text_input_type_converters.h" |
9 #include "components/mus/public/cpp/window.h" | 8 #include "components/mus/public/cpp/window.h" |
| 9 #include "mojo/converters/blink/blink_input_events_type_converters.h" |
10 #include "third_party/WebKit/public/web/WebInputEvent.h" | 10 #include "third_party/WebKit/public/web/WebInputEvent.h" |
11 #include "third_party/WebKit/public/web/WebWidget.h" | 11 #include "third_party/WebKit/public/web/WebWidget.h" |
12 | 12 |
13 namespace html_viewer { | 13 namespace html_viewer { |
14 | 14 |
15 ImeController::ImeController(mus::Window* window, blink::WebWidget* widget) | 15 ImeController::ImeController(mus::Window* window, blink::WebWidget* widget) |
16 : window_(window), widget_(widget) {} | 16 : window_(window), widget_(widget) {} |
17 | 17 |
18 ImeController::~ImeController() {} | 18 ImeController::~ImeController() {} |
19 | 19 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 state->composition_start = new_info.compositionStart; | 65 state->composition_start = new_info.compositionStart; |
66 state->composition_end = new_info.compositionEnd; | 66 state->composition_end = new_info.compositionEnd; |
67 if (show_ime) | 67 if (show_ime) |
68 window_->SetImeVisibility(true, state.Pass()); | 68 window_->SetImeVisibility(true, state.Pass()); |
69 else | 69 else |
70 window_->SetTextInputState(state.Pass()); | 70 window_->SetTextInputState(state.Pass()); |
71 } | 71 } |
72 } | 72 } |
73 | 73 |
74 } // namespace html_viewer | 74 } // namespace html_viewer |
OLD | NEW |