Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: ui/views/mus/input_method_mus.cc

Issue 2016583002: mojo/converters/ime,display -> ui/platform_window,display/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@converters_surfaces
Patch Set: . Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/mus/BUILD.gn ('k') | ui/views/mus/screen_mus.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/views/mus/input_method_mus.h" 5 #include "ui/views/mus/input_method_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "components/mus/public/cpp/window.h" 9 #include "components/mus/public/cpp/window.h"
10 #include "mojo/converters/ime/ime_type_converters.h"
11 #include "ui/base/ime/text_input_client.h" 10 #include "ui/base/ime/text_input_client.h"
12 #include "ui/events/event.h" 11 #include "ui/events/event.h"
13 #include "ui/mojo/ime/text_input_state.mojom.h" 12 #include "ui/platform_window/mojo/ime_type_converters.h"
13 #include "ui/platform_window/mojo/text_input_state.mojom.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 //////////////////////////////////////////////////////////////////////////////// 17 ////////////////////////////////////////////////////////////////////////////////
18 // InputMethodMUS, public: 18 // InputMethodMUS, public:
19 19
20 InputMethodMUS::InputMethodMUS(ui::internal::InputMethodDelegate* delegate, 20 InputMethodMUS::InputMethodMUS(ui::internal::InputMethodDelegate* delegate,
21 mus::Window* window) 21 mus::Window* window)
22 : window_(window) { 22 : window_(window) {
23 SetDelegate(delegate); 23 SetDelegate(delegate);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ui::TextInputType type = GetTextInputType(); 97 ui::TextInputType type = GetTextInputType();
98 mojo::TextInputStatePtr state = mojo::TextInputState::New(); 98 mojo::TextInputStatePtr state = mojo::TextInputState::New();
99 state->type = mojo::ConvertTo<mojo::TextInputType>(type); 99 state->type = mojo::ConvertTo<mojo::TextInputType>(type);
100 if (type != ui::TEXT_INPUT_TYPE_NONE) 100 if (type != ui::TEXT_INPUT_TYPE_NONE)
101 window_->SetImeVisibility(true, std::move(state)); 101 window_->SetImeVisibility(true, std::move(state));
102 else 102 else
103 window_->SetTextInputState(std::move(state)); 103 window_->SetTextInputState(std::move(state));
104 } 104 }
105 105
106 } // namespace views 106 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/BUILD.gn ('k') | ui/views/mus/screen_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698