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 46bbdc5bec75be20cc9f57451bcf414b01a86b9b..82a9fc85c959e4a36643af066e1027698c020362 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,11 +120,17 @@ class WindowManagerApplication
   std::unique_ptr<ui::mojo::UIInit> ui_init_;
   std::unique_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_bindings_;
+  std::vector<scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::ShelfLayout>>>

[James Cook, 2016/04/11 23:36:48]

scoped_ptr -> unique_ptr ... I think this file has already been through the
mega-conversion

[msw, 2016/04/12 00:13:59]

Done.

+      shelf_layout_requests_;
+
   // |user_window_controller_| is created once OnEmbed() is called. Until that
   // time |user_window_controller_requests_| stores pending interface requests.
   std::unique_ptr<UserWindowControllerImpl> user_window_controller_;
   mojo::BindingSet<mash::wm::mojom::UserWindowController>
-      user_window_controller_binding_;
+      user_window_controller_bindings_;
   std::vector<std::unique_ptr<
       mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>>
       user_window_controller_requests_;