Index: ash/mus/sysui_application.h |
diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h |
index dba0f5e3dc28d611a985b4767c302f017fa3b96b..5d4ce72e11a50710883b14617c4189c91df73f57 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::ShelfController> { |
public: |
SysUIApplication(); |
~SysUIApplication() override; |
@@ -27,9 +31,17 @@ class SysUIApplication : public mojo::ShellClient { |
uint32_t id) override; |
bool AcceptConnection(mojo::Connection* connection) override; |
+ // InterfaceFactory<mash::shelf::mojom::ShelfController>: |
+ void Create(mojo::Connection* connection, |
+ mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> |
+ request) override; |
+ |
mojo::TracingImpl tracing_; |
scoped_ptr<AshInit> ash_init_; |
+ mojo::BindingSet<mash::shelf::mojom::ShelfController> |
+ shelf_controller_bindings_; |
+ |
DISALLOW_COPY_AND_ASSIGN(SysUIApplication); |
}; |