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 "ui/aura/mus/input_method_mus.h" | 5 #include "ui/aura/mus/input_method_mus.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "services/ui/public/interfaces/constants.mojom.h" | 10 #include "services/ui/public/interfaces/constants.mojom.h" |
10 #include "services/ui/public/interfaces/ime/ime.mojom.h" | 11 #include "services/ui/public/interfaces/ime/ime.mojom.h" |
11 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" | 12 #include "services/ui/public/interfaces/window_tree_constants.mojom.h" |
12 #include "ui/aura/mus/text_input_client_impl.h" | 13 #include "ui/aura/mus/text_input_client_impl.h" |
13 #include "ui/aura/mus/window_port_mus.h" | 14 #include "ui/aura/mus/window_port_mus.h" |
14 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
15 #include "ui/base/ime/text_input_client.h" | 16 #include "ui/base/ime/text_input_client.h" |
16 #include "ui/events/event.h" | 17 #include "ui/events/event.h" |
17 #include "ui/platform_window/mojo/ime_type_converters.h" | 18 #include "ui/platform_window/mojo/ime_type_converters.h" |
18 #include "ui/platform_window/mojo/text_input_state.mojom.h" | 19 #include "ui/platform_window/mojo/text_input_state.mojom.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 event_result = EventResult::HANDLED; | 162 event_result = EventResult::HANDLED; |
162 } | 163 } |
163 // |ack_callback| can be null if the standard form of DispatchKeyEvent() is | 164 // |ack_callback| can be null if the standard form of DispatchKeyEvent() is |
164 // called instead of the version which provides a callback. In mus+ash we | 165 // called instead of the version which provides a callback. In mus+ash we |
165 // use the version with callback, but some unittests use the standard form. | 166 // use the version with callback, but some unittests use the standard form. |
166 if (ack_callback) | 167 if (ack_callback) |
167 ack_callback->Run(event_result); | 168 ack_callback->Run(event_result); |
168 } | 169 } |
169 | 170 |
170 } // namespace aura | 171 } // namespace aura |
OLD | NEW |