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

Unified Diff: ash/sysui/sysui_application.cc

Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 4 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
« no previous file with comments | « ash/sysui/sysui_application.h ('k') | chrome/app/mojo/chrome_manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/sysui_application.cc
diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc
index f69e5063e44f2d9edf6ccb4675a416aaceab79e2..395316dc941a0a0f77e1fcc467ad9d7cf55dfdfa 100644
--- a/ash/sysui/sysui_application.cc
+++ b/ash/sysui/sysui_application.cc
@@ -23,7 +23,6 @@
#include "ash/shell_init_params.h"
#include "ash/sysui/app_list_presenter_mus.h"
#include "ash/sysui/keyboard_ui_mus.h"
-#include "ash/sysui/shelf_delegate_mus.h"
#include "ash/sysui/shell_delegate_mus.h"
#include "ash/sysui/stub_context_factory.h"
#include "ash/sysui/wallpaper_delegate_mus.h"
@@ -324,20 +323,10 @@ void SysUIApplication::OnStart(const ::shell::Identity& identity) {
bool SysUIApplication::OnConnect(const ::shell::Identity& remote_identity,
::shell::InterfaceRegistry* registry) {
- registry->AddInterface<mash::shelf::mojom::ShelfController>(this);
registry->AddInterface<mojom::WallpaperController>(this);
return true;
}
-void SysUIApplication::Create(
- const ::shell::Identity& remote_identity,
- mash::shelf::mojom::ShelfControllerRequest request) {
- mash::shelf::mojom::ShelfController* shelf_controller =
- static_cast<ShelfDelegateMus*>(WmShell::Get()->shelf_delegate());
- DCHECK(shelf_controller);
- shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
-}
-
void SysUIApplication::Create(const ::shell::Identity& remote_identity,
mojom::WallpaperControllerRequest request) {
mojom::WallpaperController* wallpaper_controller =
« no previous file with comments | « ash/sysui/sysui_application.h ('k') | chrome/app/mojo/chrome_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698