diff options
author | fsamuel <fsamuel@chromium.org> | 2015-10-15 17:12:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-16 00:13:20 +0000 |
commit | 68afcf453d29c8f311b34a0aa210e042d4adc132 (patch) | |
tree | 5d7e25e02abe745aec485ecb4450f37d24b080c8 /components/html_viewer/ime_controller.cc | |
parent | da33ab883a2046613836487d852d5fd36f1dc4c3 (diff) | |
download | chromium_src-68afcf453d29c8f311b34a0aa210e042d4adc132.zip chromium_src-68afcf453d29c8f311b34a0aa210e042d4adc132.tar.gz chromium_src-68afcf453d29c8f311b34a0aa210e042d4adc132.tar.bz2 |
View => Window in components/mus/public/cpp
This CL updates the client lib to refer to mus::Windows and
mus::WindowServer instead of View and View Manager.
I hope I caught everything. I'll clean things up in
subsequent CLs, and start renaming the interfaces and
implementation.
BUG=542848
Review URL: https://codereview.chromium.org/1402223003
Cr-Commit-Position: refs/heads/master@{#354411}
Diffstat (limited to 'components/html_viewer/ime_controller.cc')
-rw-r--r-- | components/html_viewer/ime_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/html_viewer/ime_controller.cc b/components/html_viewer/ime_controller.cc index 9fe06b3..3b65a5a 100644 --- a/components/html_viewer/ime_controller.cc +++ b/components/html_viewer/ime_controller.cc @@ -6,14 +6,14 @@ #include "components/html_viewer/blink_input_events_type_converters.h" #include "components/html_viewer/blink_text_input_type_converters.h" -#include "components/mus/public/cpp/view.h" +#include "components/mus/public/cpp/window.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebWidget.h" namespace html_viewer { -ImeController::ImeController(mus::View* view, blink::WebWidget* widget) - : view_(view), widget_(widget) {} +ImeController::ImeController(mus::Window* window, blink::WebWidget* widget) + : window_(window), widget_(widget) {} ImeController::~ImeController() {} @@ -65,9 +65,9 @@ void ImeController::UpdateTextInputState(bool show_ime) { state->composition_start = new_info.compositionStart; state->composition_end = new_info.compositionEnd; if (show_ime) - view_->SetImeVisibility(true, state.Pass()); + window_->SetImeVisibility(true, state.Pass()); else - view_->SetTextInputState(state.Pass()); + window_->SetTextInputState(state.Pass()); } } |