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

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

Issue 2539453002: IME for Mus: Add ui.mojom.CompositionText and its struct traits. (Closed)
Patch Set: cleanup. Created 4 years 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
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 "services/ui/public/cpp/window.h" 9 #include "services/ui/public/cpp/window.h"
10 #include "services/ui/public/interfaces/constants.mojom.h" 10 #include "services/ui/public/interfaces/constants.mojom.h"
11 #include "services/ui/public/interfaces/ime.mojom.h" 11 #include "services/ui/public/interfaces/ime/ime.mojom.h"
12 #include "ui/base/ime/text_input_client.h" 12 #include "ui/base/ime/text_input_client.h"
13 #include "ui/events/event.h" 13 #include "ui/events/event.h"
14 #include "ui/platform_window/mojo/ime_type_converters.h" 14 #include "ui/platform_window/mojo/ime_type_converters.h"
15 #include "ui/platform_window/mojo/text_input_state.mojom.h" 15 #include "ui/platform_window/mojo/text_input_state.mojom.h"
16 #include "ui/views/mus/text_input_client_impl.h" 16 #include "ui/views/mus/text_input_client_impl.h"
17 17
18 using ui::mojom::EventResult; 18 using ui::mojom::EventResult;
19 19
20 namespace views { 20 namespace views {
21 21
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 event_result = EventResult::HANDLED; 155 event_result = EventResult::HANDLED;
156 } 156 }
157 // |ack_callback| can be null if the standard form of DispatchKeyEvent() is 157 // |ack_callback| can be null if the standard form of DispatchKeyEvent() is
158 // called instead of the version which provides a callback. In mus+ash we 158 // called instead of the version which provides a callback. In mus+ash we
159 // use the version with callback, but some unittests use the standard form. 159 // use the version with callback, but some unittests use the standard form.
160 if (ack_callback) 160 if (ack_callback)
161 ack_callback->Run(event_result); 161 ack_callback->Run(event_result);
162 } 162 }
163 163
164 } // namespace views 164 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698