OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/touch_hud/mus/touch_hud_application.h" | 5 #include "ash/touch_hud/mus/touch_hud_application.h" |
6 | 6 |
7 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
8 #include "ash/touch_hud/touch_hud_renderer.h" | 8 #include "ash/touch_hud/touch_hud_renderer.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 11 #include "base/message_loop/message_loop.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "services/service_manager/public/cpp/connector.h" | 13 #include "services/service_manager/public/cpp/connector.h" |
13 #include "services/service_manager/public/cpp/service_context.h" | 14 #include "services/service_manager/public/cpp/service_context.h" |
14 #include "services/ui/public/cpp/property_type_converters.h" | 15 #include "services/ui/public/cpp/property_type_converters.h" |
15 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 16 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" |
16 #include "ui/aura/mus/property_converter.h" | 17 #include "ui/aura/mus/property_converter.h" |
17 #include "ui/views/mus/aura_init.h" | 18 #include "ui/views/mus/aura_init.h" |
18 #include "ui/views/mus/mus_client.h" | 19 #include "ui/views/mus/mus_client.h" |
19 #include "ui/views/mus/pointer_watcher_event_router.h" | 20 #include "ui/views/mus/pointer_watcher_event_router.h" |
20 #include "ui/views/pointer_watcher.h" | 21 #include "ui/views/pointer_watcher.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 | 105 |
105 void TouchHudApplication::Create( | 106 void TouchHudApplication::Create( |
106 const service_manager::BindSourceInfo& source_info, | 107 const service_manager::BindSourceInfo& source_info, |
107 mash::mojom::LaunchableRequest request) { | 108 mash::mojom::LaunchableRequest request) { |
108 binding_.Close(); | 109 binding_.Close(); |
109 binding_.Bind(std::move(request)); | 110 binding_.Bind(std::move(request)); |
110 } | 111 } |
111 | 112 |
112 } // namespace touch_hud | 113 } // namespace touch_hud |
113 } // namespace ash | 114 } // namespace ash |
OLD | NEW |