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

Unified Diff: ash/sysui/sysui_application.h

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/shell_delegate_mus.cc ('k') | ash/sysui/sysui_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/sysui_application.h
diff --git a/ash/sysui/sysui_application.h b/ash/sysui/sysui_application.h
index a9878e066c8f419a09ba5fee340b5dd2c80ab613..79b07b073066a798a2463e284e6784850cca3453 100644
--- a/ash/sysui/sysui_application.h
+++ b/ash/sysui/sysui_application.h
@@ -9,7 +9,6 @@
#include "ash/public/interfaces/wallpaper.mojom.h"
#include "base/macros.h"
-#include "mash/shelf/public/interfaces/shelf.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
@@ -22,7 +21,6 @@ class AshInit;
class SysUIApplication
: public shell::Service,
- public shell::InterfaceFactory<mash::shelf::mojom::ShelfController>,
public shell::InterfaceFactory<mojom::WallpaperController> {
public:
SysUIApplication();
@@ -34,10 +32,6 @@ class SysUIApplication
bool OnConnect(const ::shell::Identity& remote_identity,
::shell::InterfaceRegistry* registry) override;
- // InterfaceFactory<mash::shelf::mojom::ShelfController>:
- void Create(const shell::Identity& remote_identity,
- mash::shelf::mojom::ShelfControllerRequest request) override;
-
// InterfaceFactory<mojom::WallpaperController>:
void Create(const shell::Identity& remote_identity,
mojom::WallpaperControllerRequest request) override;
@@ -45,8 +39,6 @@ class SysUIApplication
tracing::Provider tracing_;
std::unique_ptr<AshInit> ash_init_;
- mojo::BindingSet<mash::shelf::mojom::ShelfController>
- shelf_controller_bindings_;
mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_;
// Subscribes to updates about input-devices.
« no previous file with comments | « ash/sysui/shell_delegate_mus.cc ('k') | ash/sysui/sysui_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698