OLD | NEW |
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "mandoline/ui/aura/input_method_mandoline.h" | 5 #include "mandoline/ui/aura/input_method_mandoline.h" |
6 | 6 |
7 #include "components/view_manager/public/cpp/view.h" | 7 #include "components/mus/public/cpp/view.h" |
8 #include "mojo/converters/ime/ime_type_converters.h" | 8 #include "mojo/converters/ime/ime_type_converters.h" |
9 #include "ui/base/ime/text_input_client.h" | 9 #include "ui/base/ime/text_input_client.h" |
10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
11 #include "ui/mojo/ime/text_input_state.mojom.h" | 11 #include "ui/mojo/ime/text_input_state.mojom.h" |
12 | 12 |
13 namespace mandoline { | 13 namespace mandoline { |
14 | 14 |
15 //////////////////////////////////////////////////////////////////////////////// | 15 //////////////////////////////////////////////////////////////////////////////// |
16 // InputMethodMandoline, public: | 16 // InputMethodMandoline, public: |
17 | 17 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 ui::TextInputType type = GetTextInputType(); | 103 ui::TextInputType type = GetTextInputType(); |
104 mojo::TextInputStatePtr state = mojo::TextInputState::New(); | 104 mojo::TextInputStatePtr state = mojo::TextInputState::New(); |
105 state->type = mojo::ConvertTo<mojo::TextInputType>(type); | 105 state->type = mojo::ConvertTo<mojo::TextInputType>(type); |
106 if (type != ui::TEXT_INPUT_TYPE_NONE) | 106 if (type != ui::TEXT_INPUT_TYPE_NONE) |
107 view_->SetImeVisibility(true, state.Pass()); | 107 view_->SetImeVisibility(true, state.Pass()); |
108 else | 108 else |
109 view_->SetTextInputState(state.Pass()); | 109 view_->SetTextInputState(state.Pass()); |
110 } | 110 } |
111 | 111 |
112 } // namespace mandoline | 112 } // namespace mandoline |
OLD | NEW |