| Index: ash/mus/window_manager_application.cc
|
| diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
|
| index f55521a3a10bde17d55141b2c6478528e36c600f..8b212d6cf80e05666352ce1d089ad44f20e1c1ff 100644
|
| --- a/ash/mus/window_manager_application.cc
|
| +++ b/ash/mus/window_manager_application.cc
|
| @@ -11,6 +11,7 @@
|
| #include "ash/mus/accelerators/accelerator_registrar_impl.h"
|
| #include "ash/mus/native_widget_factory_mus.h"
|
| #include "ash/mus/shelf_delegate_mus.h"
|
| +#include "ash/mus/system_tray_delegate_mus.h"
|
| #include "ash/mus/wallpaper_delegate_mus.h"
|
| #include "ash/mus/window_manager.h"
|
| #include "base/bind.h"
|
| @@ -154,8 +155,9 @@ void WindowManagerApplication::OnStart(const shell::Identity& identity) {
|
|
|
| bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
|
| shell::InterfaceRegistry* registry) {
|
| - registry->AddInterface<ash::mojom::ShelfController>(this);
|
| - registry->AddInterface<ash::mojom::WallpaperController>(this);
|
| + registry->AddInterface<mojom::ShelfController>(this);
|
| + registry->AddInterface<mojom::SystemTray>(this);
|
| + registry->AddInterface<mojom::WallpaperController>(this);
|
| registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
|
| if (remote_identity.name() == "mojo:mash_session") {
|
| connector()->ConnectToInterface(remote_identity, &session_);
|
| @@ -165,19 +167,25 @@ bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
|
| return true;
|
| }
|
|
|
| -void WindowManagerApplication::Create(
|
| - const shell::Identity& remote_identity,
|
| - ash::mojom::ShelfControllerRequest request) {
|
| - ash::mojom::ShelfController* shelf_controller =
|
| +void WindowManagerApplication::Create(const shell::Identity& remote_identity,
|
| + mojom::ShelfControllerRequest request) {
|
| + mojom::ShelfController* shelf_controller =
|
| static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
|
| DCHECK(shelf_controller);
|
| shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
|
| }
|
|
|
| +void WindowManagerApplication::Create(const shell::Identity& remote_identity,
|
| + mojom::SystemTrayRequest request) {
|
| + mojom::SystemTray* system_tray = SystemTrayDelegateMus::Get();
|
| + DCHECK(system_tray);
|
| + system_tray_bindings_.AddBinding(system_tray, std::move(request));
|
| +}
|
| +
|
| void WindowManagerApplication::Create(
|
| const ::shell::Identity& remote_identity,
|
| - ash::mojom::WallpaperControllerRequest request) {
|
| - ash::mojom::WallpaperController* wallpaper_controller =
|
| + mojom::WallpaperControllerRequest request) {
|
| + mojom::WallpaperController* wallpaper_controller =
|
| static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate());
|
| DCHECK(wallpaper_controller);
|
| wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
|
|
|