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

Unified Diff: ash/mus/sysui_application.h

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move chrome_launcher_prefs from ash to aura. Created 4 years, 8 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/sysui_application.h
diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h
index dba0f5e3dc28d611a985b4767c302f017fa3b96b..94ce312e379327674d5dfd590862e487060a9ac3 100644
--- a/ash/mus/sysui_application.h
+++ b/ash/mus/sysui_application.h
@@ -7,6 +7,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
+#include "mash/shelf/public/interfaces/shelf.mojom.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "mojo/shell/public/cpp/shell_client.h"
@@ -15,7 +17,9 @@ namespace sysui {
class AshInit;
-class SysUIApplication : public mojo::ShellClient {
+class SysUIApplication
+ : public mojo::ShellClient,
+ public mojo::InterfaceFactory<mash::shelf::mojom::Shelf> {
public:
SysUIApplication();
~SysUIApplication() override;
@@ -27,9 +31,16 @@ class SysUIApplication : public mojo::ShellClient {
uint32_t id) override;
bool AcceptConnection(mojo::Connection* connection) override;
+ // InterfaceFactory<mash::shelf::mojom::Shelf>:
+ void Create(
+ mojo::Connection* connection,
+ mojo::InterfaceRequest<mash::shelf::mojom::Shelf> request) override;
+
mojo::TracingImpl tracing_;
scoped_ptr<AshInit> ash_init_;
+ mojo::BindingSet<mash::shelf::mojom::Shelf> shelf_bindings_;
+
DISALLOW_COPY_AND_ASSIGN(SysUIApplication);
};

Powered by Google App Engine
This is Rietveld 408576698