Support additional mash shelf alignments.

mash/wm/window_manager_application.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_
 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #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"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 
 namespace ui {
 namespace mojo {
 class UIInit;
 }
@@ skipping 11 matching lines @@
 namespace wm {
 
 class AcceleratorRegistrarImpl;
 class RootWindowController;
 class RootWindowsObserver;
 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:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   mojo::Connector* connector() { return connector_; }
 
   // Returns the RootWindowControllers that have valid roots.
   //
@@ skipping 22 matching lines @@
   }
 
  private:
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   // mojo::ShellClient:
   void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
                   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>
                   request) override;
 
   // InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
       override;
 
   // mus::mojom::WindowManagerFactory:
   void CreateWindowManager(mus::mojom::DisplayPtr display,
                            mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
                                client_request) override;
 
   mojo::Connector* connector_;
 
   mojo::TracingImpl tracing_;
 
   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_;
 
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
   std::set<RootWindowController*> root_controllers_;
 
   mojo::Binding<mus::mojom::WindowManagerFactory>
       window_manager_factory_binding_;
 
   mash::session::mojom::SessionPtr session_;
 
   base::ObserverList<RootWindowsObserver> root_windows_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_