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/mojo_interface_factory.h" | 5 #include "ash/mojo_interface_factory.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
10 #include "ash/cast_config_controller.h" | 10 #include "ash/cast_config_controller.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "base/bind.h" | 23 #include "base/bind.h" |
24 #include "services/service_manager/public/cpp/binder_registry.h" | 24 #include "services/service_manager/public/cpp/binder_registry.h" |
25 #include "ui/app_list/presenter/app_list.h" | 25 #include "ui/app_list/presenter/app_list.h" |
26 | 26 |
27 namespace ash { | 27 namespace ash { |
28 | 28 |
29 namespace { | 29 namespace { |
30 | 30 |
31 void BindAcceleratorControllerRequestOnMainThread( | 31 void BindAcceleratorControllerRequestOnMainThread( |
32 mojom::AcceleratorControllerRequest request) { | 32 mojom::AcceleratorControllerRequest request) { |
33 Shell::Get()->accelerator_controller()->BindRequest(std::move(request)); | 33 // Shell::Get()->accelerator_controller()->BindRequest(std::move(request)); |
34 } | 34 } |
35 | 35 |
36 void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) { | 36 void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) { |
37 Shell::Get()->app_list()->BindRequest(std::move(request)); | 37 // Shell::Get()->app_list()->BindRequest(std::move(request)); |
38 } | 38 } |
39 | 39 |
40 void BindCastConfigOnMainThread(mojom::CastConfigRequest request) { | 40 void BindCastConfigOnMainThread(mojom::CastConfigRequest request) { |
41 Shell::Get()->cast_config()->BindRequest(std::move(request)); | 41 // Shell::Get()->cast_config()->BindRequest(std::move(request)); |
42 } | 42 } |
43 | 43 |
44 void BindLocaleNotificationControllerOnMainThread( | 44 void BindLocaleNotificationControllerOnMainThread( |
45 mojom::LocaleNotificationControllerRequest request) { | 45 mojom::LocaleNotificationControllerRequest request) { |
46 Shell::Get()->locale_notification_controller()->BindRequest( | 46 // Shell::Get()->locale_notification_controller()->BindRequest( |
47 std::move(request)); | 47 // std::move(request)); |
48 } | 48 } |
49 | 49 |
50 void BindMediaControllerRequestOnMainThread( | 50 void BindMediaControllerRequestOnMainThread( |
51 mojom::MediaControllerRequest request) { | 51 mojom::MediaControllerRequest request) { |
52 Shell::Get()->media_controller()->BindRequest(std::move(request)); | 52 // Shell::Get()->media_controller()->BindRequest(std::move(request)); |
53 } | 53 } |
54 | 54 |
55 void BindNewWindowControllerRequestOnMainThread( | 55 void BindNewWindowControllerRequestOnMainThread( |
56 mojom::NewWindowControllerRequest request) { | 56 mojom::NewWindowControllerRequest request) { |
57 Shell::Get()->new_window_controller()->BindRequest(std::move(request)); | 57 // Shell::Get()->new_window_controller()->BindRequest(std::move(request)); |
58 } | 58 } |
59 | 59 |
60 void BindSessionControllerRequestOnMainThread( | 60 void BindSessionControllerRequestOnMainThread( |
61 mojom::SessionControllerRequest request) { | 61 mojom::SessionControllerRequest request) { |
62 Shell::Get()->session_controller()->BindRequest(std::move(request)); | 62 // Shell::Get()->session_controller()->BindRequest(std::move(request)); |
63 } | 63 } |
64 | 64 |
65 void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) { | 65 void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) { |
66 Shell::Get()->shelf_controller()->BindRequest(std::move(request)); | 66 // Shell::Get()->shelf_controller()->BindRequest(std::move(request)); |
67 } | 67 } |
68 | 68 |
69 void BindShutdownControllerRequestOnMainThread( | 69 void BindShutdownControllerRequestOnMainThread( |
70 mojom::ShutdownControllerRequest request) { | 70 mojom::ShutdownControllerRequest request) { |
71 Shell::Get()->shutdown_controller()->BindRequest(std::move(request)); | 71 // Shell::Get()->shutdown_controller()->BindRequest(std::move(request)); |
72 } | 72 } |
73 | 73 |
74 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { | 74 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { |
75 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); | 75 // Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); |
76 } | 76 } |
77 | 77 |
78 void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) { | 78 void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) { |
79 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); | 79 // Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); |
80 } | 80 } |
81 | 81 |
82 void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) { | 82 void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) { |
83 Shell::Get()->vpn_list()->BindRequest(std::move(request)); | 83 // Shell::Get()->vpn_list()->BindRequest(std::move(request)); |
84 } | 84 } |
85 | 85 |
86 void BindWallpaperRequestOnMainThread( | 86 void BindWallpaperRequestOnMainThread( |
87 mojom::WallpaperControllerRequest request) { | 87 mojom::WallpaperControllerRequest request) { |
88 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); | 88 // Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); |
89 } | 89 } |
90 | 90 |
91 } // namespace | 91 } // namespace |
92 | 92 |
93 namespace mojo_interface_factory { | 93 namespace mojo_interface_factory { |
94 | 94 |
95 void RegisterInterfaces( | 95 void RegisterInterfaces( |
96 service_manager::BinderRegistry* registry, | 96 service_manager::BinderRegistry* registry, |
97 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) { | 97 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) { |
98 registry->AddInterface( | 98 registry->AddInterface( |
(...skipping 23 matching lines...) Expand all Loading... |
122 main_thread_task_runner); | 122 main_thread_task_runner); |
123 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 123 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
124 main_thread_task_runner); | 124 main_thread_task_runner); |
125 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 125 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
126 main_thread_task_runner); | 126 main_thread_task_runner); |
127 } | 127 } |
128 | 128 |
129 } // namespace mojo_interface_factory | 129 } // namespace mojo_interface_factory |
130 | 130 |
131 } // namespace ash | 131 } // namespace ash |
OLD | NEW |