| 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" |
| 11 #include "ash/login/lock_screen_controller.h" | 11 #include "ash/login/lock_screen_controller.h" |
| 12 #include "ash/media_controller.h" | 12 #include "ash/media_controller.h" |
| 13 #include "ash/new_window_controller.h" | 13 #include "ash/new_window_controller.h" |
| 14 #include "ash/session/session_controller.h" | 14 #include "ash/session/session_controller.h" |
| 15 #include "ash/shelf/shelf_controller.h" | 15 #include "ash/shelf/shelf_controller.h" |
| 16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 17 #include "ash/shell_delegate.h" | 17 #include "ash/shell_delegate.h" |
| 18 #include "ash/shutdown_controller.h" | 18 #include "ash/shutdown_controller.h" |
| 19 #include "ash/system/locale/locale_notification_controller.h" | 19 #include "ash/system/locale/locale_notification_controller.h" |
| 20 #include "ash/system/network/vpn_list.h" | 20 #include "ash/system/network/vpn_list.h" |
| 21 #include "ash/system/tray/system_tray_controller.h" | 21 #include "ash/system/tray/system_tray_controller.h" |
| 22 #include "ash/tray_action/tray_action.h" | 22 #include "ash/tray_action/tray_action.h" |
| 23 #include "ash/wallpaper/wallpaper_controller.h" | 23 #include "ash/wallpaper/wallpaper_controller.h" |
| 24 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 24 #include "ash/wm/tablet_mode/tablet_mode_controller.h" |
| 25 #include "base/bind.h" | 25 #include "base/bind.h" |
| 26 #include "base/single_thread_task_runner.h" | 26 #include "base/single_thread_task_runner.h" |
| 27 #include "services/service_manager/public/cpp/bind_source_info.h" | 27 #include "services/service_manager/public/cpp/bind_source_info.h" |
| 28 #include "services/service_manager/public/cpp/binder_registry.h" | 28 #include "services/service_manager/public/cpp/binder_registry.h" |
| 29 #include "ui/app_list/presenter/app_list.h" | 29 #include "ui/app_list/presenter/app_list.h" |
| 30 | 30 |
| 31 namespace ash { | 31 namespace ash { |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 | 95 |
| 96 void BindSystemTrayRequestOnMainThread( | 96 void BindSystemTrayRequestOnMainThread( |
| 97 const service_manager::BindSourceInfo& source_info, | 97 const service_manager::BindSourceInfo& source_info, |
| 98 mojom::SystemTrayRequest request) { | 98 mojom::SystemTrayRequest request) { |
| 99 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); | 99 Shell::Get()->system_tray_controller()->BindRequest(std::move(request)); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void BindTouchViewRequestOnMainThread( | 102 void BindTouchViewRequestOnMainThread( |
| 103 const service_manager::BindSourceInfo& source_info, | 103 const service_manager::BindSourceInfo& source_info, |
| 104 mojom::TouchViewManagerRequest request) { | 104 mojom::TouchViewManagerRequest request) { |
| 105 Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request)); | 105 Shell::Get()->tablet_mode_controller()->BindRequest(std::move(request)); |
| 106 } | 106 } |
| 107 | 107 |
| 108 void BindTrayActionRequestOnMainThread( | 108 void BindTrayActionRequestOnMainThread( |
| 109 const service_manager::BindSourceInfo& source_info, | 109 const service_manager::BindSourceInfo& source_info, |
| 110 mojom::TrayActionRequest request) { | 110 mojom::TrayActionRequest request) { |
| 111 Shell::Get()->tray_action()->BindRequest(std::move(request)); | 111 Shell::Get()->tray_action()->BindRequest(std::move(request)); |
| 112 } | 112 } |
| 113 | 113 |
| 114 void BindVpnListRequestOnMainThread( | 114 void BindVpnListRequestOnMainThread( |
| 115 const service_manager::BindSourceInfo& source_info, | 115 const service_manager::BindSourceInfo& source_info, |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 main_thread_task_runner); | 161 main_thread_task_runner); |
| 162 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), | 162 registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread), |
| 163 main_thread_task_runner); | 163 main_thread_task_runner); |
| 164 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), | 164 registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread), |
| 165 main_thread_task_runner); | 165 main_thread_task_runner); |
| 166 } | 166 } |
| 167 | 167 |
| 168 } // namespace mojo_interface_factory | 168 } // namespace mojo_interface_factory |
| 169 | 169 |
| 170 } // namespace ash | 170 } // namespace ash |
| OLD | NEW |