Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Side by Side Diff: ash/mojo_interface_factory.cc

Issue 2870473002: Revert of Introduce ash mojo interface for lock screen action handlers (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/BUILD.gn ('k') | ash/mus/manifest.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/media_controller.h" 11 #include "ash/media_controller.h"
12 #include "ash/new_window_controller.h" 12 #include "ash/new_window_controller.h"
13 #include "ash/session/session_controller.h" 13 #include "ash/session/session_controller.h"
14 #include "ash/shelf/shelf_controller.h" 14 #include "ash/shelf/shelf_controller.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/shell_delegate.h" 16 #include "ash/shell_delegate.h"
17 #include "ash/shutdown_controller.h" 17 #include "ash/shutdown_controller.h"
18 #include "ash/system/locale/locale_notification_controller.h" 18 #include "ash/system/locale/locale_notification_controller.h"
19 #include "ash/system/network/vpn_list.h" 19 #include "ash/system/network/vpn_list.h"
20 #include "ash/system/tray/system_tray_controller.h" 20 #include "ash/system/tray/system_tray_controller.h"
21 #include "ash/tray_action/tray_action.h"
22 #include "ash/wallpaper/wallpaper_controller.h" 21 #include "ash/wallpaper/wallpaper_controller.h"
23 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 22 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
24 #include "base/bind.h" 23 #include "base/bind.h"
25 #include "services/service_manager/public/cpp/bind_source_info.h" 24 #include "services/service_manager/public/cpp/bind_source_info.h"
26 #include "services/service_manager/public/cpp/binder_registry.h" 25 #include "services/service_manager/public/cpp/binder_registry.h"
27 #include "ui/app_list/presenter/app_list.h" 26 #include "ui/app_list/presenter/app_list.h"
28 27
29 namespace ash { 28 namespace ash {
30 29
31 namespace { 30 namespace {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 mojom::SystemTrayRequest request) { 89 mojom::SystemTrayRequest request) {
91 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); 90 Shell::Get()->system_tray_controller()->BindRequest(std::move(request));
92 } 91 }
93 92
94 void BindTouchViewRequestOnMainThread( 93 void BindTouchViewRequestOnMainThread(
95 const service_manager::BindSourceInfo& source_info, 94 const service_manager::BindSourceInfo& source_info,
96 mojom::TouchViewManagerRequest request) { 95 mojom::TouchViewManagerRequest request) {
97 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); 96 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request));
98 } 97 }
99 98
100 void BindTrayActionRequestOnMainThread(
101 const service_manager::BindSourceInfo& source_info,
102 mojom::TrayActionRequest request) {
103 Shell::Get()->tray_action()->BindRequest(std::move(request));
104 }
105
106 void BindVpnListRequestOnMainThread( 99 void BindVpnListRequestOnMainThread(
107 const service_manager::BindSourceInfo& source_info, 100 const service_manager::BindSourceInfo& source_info,
108 mojom::VpnListRequest request) { 101 mojom::VpnListRequest request) {
109 Shell::Get()->vpn_list()->BindRequest(std::move(request)); 102 Shell::Get()->vpn_list()->BindRequest(std::move(request));
110 } 103 }
111 104
112 void BindWallpaperRequestOnMainThread( 105 void BindWallpaperRequestOnMainThread(
113 const service_manager::BindSourceInfo& source_info, 106 const service_manager::BindSourceInfo& source_info,
114 mojom::WallpaperControllerRequest request) { 107 mojom::WallpaperControllerRequest request) {
115 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request)); 108 Shell::Get()->wallpaper_controller()->BindRequest(std::move(request));
(...skipping 24 matching lines...) Expand all
140 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread), 133 registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread),
141 main_thread_task_runner); 134 main_thread_task_runner);
142 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread), 135 registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread),
143 main_thread_task_runner); 136 main_thread_task_runner);
144 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread), 137 registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread),
145 main_thread_task_runner); 138 main_thread_task_runner);
146 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), 139 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread),
147 main_thread_task_runner); 140 main_thread_task_runner);
148 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread), 141 registry->AddInterface(base::Bind(&BindTouchViewRequestOnMainThread),
149 main_thread_task_runner); 142 main_thread_task_runner);
150 registry->AddInterface(base::Bind(&BindTrayActionRequestOnMainThread),
151 main_thread_task_runner);
152 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), 143 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread),
153 main_thread_task_runner); 144 main_thread_task_runner);
154 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), 145 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
155 main_thread_task_runner); 146 main_thread_task_runner);
156 } 147 }
157 148
158 } // namespace mojo_interface_factory 149 } // namespace mojo_interface_factory
159 150
160 } // namespace ash 151 } // namespace ash
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/mus/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698