| 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/base/ime/input_method_base.h" | |
| 6 | |
| 7 #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ | 5 #ifndef UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ |
| 8 #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ | 6 #define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ |
| 9 | 7 |
| 10 #include "base/macros.h" | 8 #include "base/macros.h" |
| 11 #include "mojo/public/cpp/bindings/strong_binding.h" | 9 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 12 #include "services/service_manager/public/cpp/connector.h" | 10 #include "services/service_manager/public/cpp/connector.h" |
| 13 #include "services/ui/public/interfaces/ime.mojom.h" | 11 #include "services/ui/public/interfaces/ime.mojom.h" |
| 12 #include "ui/base/ime/input_method_base.h" |
| 14 #include "ui/views/mus/mus_export.h" | 13 #include "ui/views/mus/mus_export.h" |
| 15 | 14 |
| 16 namespace ui { | 15 namespace ui { |
| 17 class Window; | 16 class Window; |
| 18 namespace mojom { | 17 namespace mojom { |
| 19 enum class EventResult; | 18 enum class EventResult; |
| 20 } // namespace mojom | 19 } // namespace mojom |
| 21 } // namespace ui | 20 } // namespace ui |
| 22 | 21 |
| 23 namespace views { | 22 namespace views { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 ui::mojom::IMEServerPtr ime_server_; | 68 ui::mojom::IMEServerPtr ime_server_; |
| 70 ui::mojom::InputMethodPtr input_method_; | 69 ui::mojom::InputMethodPtr input_method_; |
| 71 std::unique_ptr<TextInputClientImpl> text_input_client_; | 70 std::unique_ptr<TextInputClientImpl> text_input_client_; |
| 72 | 71 |
| 73 DISALLOW_COPY_AND_ASSIGN(InputMethodMus); | 72 DISALLOW_COPY_AND_ASSIGN(InputMethodMus); |
| 74 }; | 73 }; |
| 75 | 74 |
| 76 } // namespace views | 75 } // namespace views |
| 77 | 76 |
| 78 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ | 77 #endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_ |
| OLD | NEW |