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/common/mojo_interface_factory.h" | 5 #include "ash/common/mojo_interface_factory.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
10 #include "ash/common/cast_config_controller.h" | 10 #include "ash/common/cast_config_controller.h" |
11 #include "ash/common/new_window_controller.h" | 11 #include "ash/common/new_window_controller.h" |
| 12 #include "ash/common/session/session_controller.h" |
12 #include "ash/common/shelf/shelf_controller.h" | 13 #include "ash/common/shelf/shelf_controller.h" |
13 #include "ash/common/shutdown_controller.h" | 14 #include "ash/common/shutdown_controller.h" |
14 #include "ash/common/system/locale/locale_notification_controller.h" | 15 #include "ash/common/system/locale/locale_notification_controller.h" |
15 #include "ash/common/system/tray/system_tray_controller.h" | 16 #include "ash/common/system/tray/system_tray_controller.h" |
16 #include "ash/common/wallpaper/wallpaper_controller.h" | 17 #include "ash/common/wallpaper/wallpaper_controller.h" |
17 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 18 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
18 #include "ash/common/wm_shell.h" | 19 #include "ash/common/wm_shell.h" |
19 #include "base/bind.h" | 20 #include "base/bind.h" |
20 #include "services/service_manager/public/cpp/interface_registry.h" | 21 #include "services/service_manager/public/cpp/interface_registry.h" |
21 | 22 |
(...skipping 18 matching lines...) Expand all Loading... |
40 mojom::LocaleNotificationControllerRequest request) { | 41 mojom::LocaleNotificationControllerRequest request) { |
41 WmShell::Get()->locale_notification_controller()->BindRequest( | 42 WmShell::Get()->locale_notification_controller()->BindRequest( |
42 std::move(request)); | 43 std::move(request)); |
43 } | 44 } |
44 | 45 |
45 void BindNewWindowControllerRequestOnMainThread( | 46 void BindNewWindowControllerRequestOnMainThread( |
46 mojom::NewWindowControllerRequest request) { | 47 mojom::NewWindowControllerRequest request) { |
47 WmShell::Get()->new_window_controller()->BindRequest(std::move(request)); | 48 WmShell::Get()->new_window_controller()->BindRequest(std::move(request)); |
48 } | 49 } |
49 | 50 |
| 51 void BindSessionControllerRequestOnMainThread( |
| 52 mojom::SessionControllerRequest request) { |
| 53 WmShell::Get()->session_controller()->BindRequest(std::move(request)); |
| 54 } |
| 55 |
50 void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) { | 56 void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) { |
51 WmShell::Get()->shelf_controller()->BindRequest(std::move(request)); | 57 WmShell::Get()->shelf_controller()->BindRequest(std::move(request)); |
52 } | 58 } |
53 | 59 |
54 void BindShutdownControllerRequestOnMainThread( | 60 void BindShutdownControllerRequestOnMainThread( |
55 mojom::ShutdownControllerRequest request) { | 61 mojom::ShutdownControllerRequest request) { |
56 WmShell::Get()->shutdown_controller()->BindRequest(std::move(request)); | 62 WmShell::Get()->shutdown_controller()->BindRequest(std::move(request)); |
57 } | 63 } |
58 | 64 |
59 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { | 65 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { |
(...skipping 26 matching lines...) Expand all Loading... |
86 base::Bind(&BindAcceleratorControllerRequestOnMainThread), | 92 base::Bind(&BindAcceleratorControllerRequestOnMainThread), |
87 main_thread_task_runner); | 93 main_thread_task_runner); |
88 registry->AddInterface(base::Bind(&BindCastConfigOnMainThread), | 94 registry->AddInterface(base::Bind(&BindCastConfigOnMainThread), |
89 main_thread_task_runner); | 95 main_thread_task_runner); |
90 registry->AddInterface( | 96 registry->AddInterface( |
91 base::Bind(&BindLocaleNotificationControllerOnMainThread), | 97 base::Bind(&BindLocaleNotificationControllerOnMainThread), |
92 main_thread_task_runner); | 98 main_thread_task_runner); |
93 registry->AddInterface( | 99 registry->AddInterface( |
94 base::Bind(&BindNewWindowControllerRequestOnMainThread), | 100 base::Bind(&BindNewWindowControllerRequestOnMainThread), |
95 main_thread_task_runner); | 101 main_thread_task_runner); |
| 102 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), |
| 103 main_thread_task_runner); |
96 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), | 104 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), |
97 main_thread_task_runner); | 105 main_thread_task_runner); |
98 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), | 106 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), |
99 main_thread_task_runner); | 107 main_thread_task_runner); |
100 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), | 108 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), |
101 main_thread_task_runner); | 109 main_thread_task_runner); |
102 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), | 110 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), |
103 main_thread_task_runner); | 111 main_thread_task_runner); |
104 #if defined(OS_CHROMEOS) | 112 #if defined(OS_CHROMEOS) |
105 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 113 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
106 main_thread_task_runner); | 114 main_thread_task_runner); |
107 #endif | 115 #endif |
108 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 116 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
109 main_thread_task_runner); | 117 main_thread_task_runner); |
110 } | 118 } |
111 | 119 |
112 } // namespace mojo_interface_factory | 120 } // namespace mojo_interface_factory |
113 | 121 |
114 } // namespace ash | 122 } // namespace ash |
OLD | NEW |