| 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" | 7 #include "components/html_viewer/blink_input_events_type_converters.h" |
| 8 #include "components/html_viewer/blink_text_input_type_converters.h" | 8 #include "components/html_viewer/blink_text_input_type_converters.h" |
| 9 #include "components/mus/public/cpp/view.h" | 9 #include "components/mus/public/cpp/view.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::View* view, blink::WebWidget* widget) | 15 ImeController::ImeController(mojo::View* view, blink::WebWidget* widget) |
| 16 : view_(view), widget_(widget) {} | 16 : view_(view), widget_(widget) { |
| 17 } |
| 17 | 18 |
| 18 ImeController::~ImeController() {} | 19 ImeController::~ImeController() {} |
| 19 | 20 |
| 20 void ImeController::ResetInputMethod() { | 21 void ImeController::ResetInputMethod() { |
| 21 // TODO(penghuang): Reset IME. | 22 // TODO(penghuang): Reset IME. |
| 22 } | 23 } |
| 23 | 24 |
| 24 void ImeController::DidHandleGestureEvent(const blink::WebGestureEvent& event, | 25 void ImeController::DidHandleGestureEvent(const blink::WebGestureEvent& event, |
| 25 bool event_cancelled) { | 26 bool event_cancelled) { |
| 26 // Called when a gesture event is handled. | 27 // Called when a gesture event is handled. |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 state->composition_start = new_info.compositionStart; | 66 state->composition_start = new_info.compositionStart; |
| 66 state->composition_end = new_info.compositionEnd; | 67 state->composition_end = new_info.compositionEnd; |
| 67 if (show_ime) | 68 if (show_ime) |
| 68 view_->SetImeVisibility(true, state.Pass()); | 69 view_->SetImeVisibility(true, state.Pass()); |
| 69 else | 70 else |
| 70 view_->SetTextInputState(state.Pass()); | 71 view_->SetTextInputState(state.Pass()); |
| 71 } | 72 } |
| 72 } | 73 } |
| 73 | 74 |
| 74 } // namespace html_viewer | 75 } // namespace html_viewer |
| OLD | NEW |