| Index: ash/common/mojo_interface_factory.cc
|
| diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc
|
| index b745571f7c43e67df09979884f92655bc31fa811..d6a38b9fee4fd27644d527f627e66c8cc43a0e55 100644
|
| --- a/ash/common/mojo_interface_factory.cc
|
| +++ b/ash/common/mojo_interface_factory.cc
|
| @@ -9,6 +9,7 @@
|
| #include "ash/common/shelf/shelf_controller.h"
|
| #include "ash/common/system/locale/locale_notification_controller.h"
|
| #include "ash/common/system/tray/system_tray_controller.h"
|
| +#include "ash/common/wallpaper/wallpaper_controller.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "base/bind.h"
|
| #include "services/service_manager/public/cpp/interface_registry.h"
|
| @@ -23,8 +24,7 @@ void BindLocaleNotificationControllerOnMainThread(
|
| std::move(request));
|
| }
|
|
|
| -void BindShelfControllerRequestOnMainThread(
|
| - mojom::ShelfControllerRequest request) {
|
| +void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) {
|
| WmShell::Get()->shelf_controller()->BindRequest(std::move(request));
|
| }
|
|
|
| @@ -32,6 +32,11 @@ void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
|
| WmShell::Get()->system_tray_controller()->BindRequest(std::move(request));
|
| }
|
|
|
| +void BindWallpaperRequestOnMainThread(
|
| + mojom::WallpaperControllerRequest request) {
|
| + WmShell::Get()->wallpaper_controller()->BindRequest(std::move(request));
|
| +}
|
| +
|
| } // namespace
|
|
|
| namespace mojo_interface_factory {
|
| @@ -42,10 +47,12 @@ void RegisterInterfaces(
|
| registry->AddInterface(
|
| base::Bind(&BindLocaleNotificationControllerOnMainThread),
|
| main_thread_task_runner);
|
| - registry->AddInterface(base::Bind(&BindShelfControllerRequestOnMainThread),
|
| + registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread),
|
| main_thread_task_runner);
|
| registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread),
|
| main_thread_task_runner);
|
| + registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
|
| + main_thread_task_runner);
|
| }
|
|
|
| } // namespace mojo_interface_factory
|
|
|