| 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 "ash/common/shelf/shelf_controller.h" | 7 #include "ash/common/shelf/shelf_controller.h" |
| 8 #include "ash/common/system/tray/system_tray_controller.h" | 8 #include "ash/common/system/tray/system_tray_controller.h" |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { | 22 void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) { |
| 23 WmShell::Get()->system_tray_controller()->BindRequest(std::move(request)); | 23 WmShell::Get()->system_tray_controller()->BindRequest(std::move(request)); |
| 24 } | 24 } |
| 25 | 25 |
| 26 } // namespace | 26 } // namespace |
| 27 | 27 |
| 28 namespace mojo_interface_factory { | 28 namespace mojo_interface_factory { |
| 29 | 29 |
| 30 void RegisterInterfaces( | 30 void RegisterInterfaces( |
| 31 shell::InterfaceRegistry* registry, | 31 service_manager::InterfaceRegistry* registry, |
| 32 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) { | 32 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner) { |
| 33 registry->AddInterface(base::Bind(&BindShelfControllerRequestOnMainThread), | 33 registry->AddInterface(base::Bind(&BindShelfControllerRequestOnMainThread), |
| 34 main_thread_task_runner); | 34 main_thread_task_runner); |
| 35 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), | 35 registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread), |
| 36 main_thread_task_runner); | 36 main_thread_task_runner); |
| 37 } | 37 } |
| 38 | 38 |
| 39 } // namespace mojo_interface_factory | 39 } // namespace mojo_interface_factory |
| 40 | 40 |
| 41 } // namespace ash | 41 } // namespace ash |
| OLD | NEW |