Support additional mash shelf alignments.

mash/wm/window_manager_application.h

Index: mash/wm/window_manager_application.h
diff --git a/mash/wm/window_manager_application.h b/mash/wm/window_manager_application.h
index b6cd4958ccc8ee13f6898f30fcf7f903619e4b26..5adbbcc261935b23785c22de6cd1856f2f8e7b0d 100644
--- a/mash/wm/window_manager_application.h
+++ b/mash/wm/window_manager_application.h
@@ -18,6 +18,7 @@
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "mash/session/public/interfaces/session.mojom.h"
+#include "mash/wm/public/interfaces/shelf_layout.mojom.h"
 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
@@ -49,6 +50,7 @@ class UserWindowControllerImpl;
 class WindowManagerApplication
     : public mojo::ShellClient,
       public mus::mojom::WindowManagerFactory,
+      public mojo::InterfaceFactory<mash::wm::mojom::ShelfLayout>,
       public mojo::InterfaceFactory<mash::wm::mojom::UserWindowController>,
       public mojo::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
  public:
@@ -91,6 +93,11 @@ class WindowManagerApplication
                   uint32_t id) override;
   bool AcceptConnection(mojo::Connection* connection) override;
 
+  // InterfaceFactory<mash::wm::mojom::ShelfLayout>:
+  void Create(mojo::Connection* connection,
+              mojo::InterfaceRequest<mash::wm::mojom::ShelfLayout>
+                  request) override;
+
   // InterfaceFactory<mash::wm::mojom::UserWindowController>:
   void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>
@@ -113,6 +120,12 @@ class WindowManagerApplication
   scoped_ptr<ui::mojo::UIInit> ui_init_;
   scoped_ptr<views::AuraInit> aura_init_;
 
+  // The ShelfLayout object is created once OnEmbed() is called. Until that
+  // time |shelf_layout_requests_| stores pending interface requests.
+  mojo::BindingSet<mash::wm::mojom::ShelfLayout> shelf_layout_binding_;
+  std::vector<scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::ShelfLayout>>>
+      shelf_layout_requests_;
+
   // |user_window_controller_| is created once OnEmbed() is called. Until that
   // time |user_window_controller_requests_| stores pending interface requests.
   scoped_ptr<UserWindowControllerImpl> user_window_controller_;