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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2413503002: Cleanup mojo Wallpaper interfaces for mash. (Closed)
Patch Set: Cleanup. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 052987089d806202a7cf664148bc09efe15447c3..f930cfb37b5418227cc26d138e69f7b4326d6207 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -11,7 +11,6 @@
#include "ash/common/wm_shell.h"
#include "ash/mus/accelerators/accelerator_registrar_impl.h"
#include "ash/mus/native_widget_factory_mus.h"
-#include "ash/mus/wallpaper_delegate_mus.h"
#include "ash/mus/window_manager.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
@@ -183,7 +182,6 @@ bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
mojo_interface_factory::RegisterInterfaces(
registry, base::ThreadTaskRunnerHandle::Get());
- registry->AddInterface<mojom::WallpaperController>(this);
registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
if (remote_identity.name() == "service:mash_session") {
connector()->ConnectToInterface(remote_identity, &session_);
@@ -194,16 +192,6 @@ bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
}
void WindowManagerApplication::Create(
- const ::shell::Identity& remote_identity,
- mojom::WallpaperControllerRequest request) {
- mojom::WallpaperController* wallpaper_controller =
- static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate());
- DCHECK(wallpaper_controller);
- wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
- std::move(request));
-}
-
-void WindowManagerApplication::Create(
const shell::Identity& remote_identity,
ui::mojom::AcceleratorRegistrarRequest request) {
if (!window_manager_->window_manager_client())

Powered by Google App Engine
This is Rietveld 408576698