Add rudimentary mash shelf functionality.

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 <set>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.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_tree_host.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
+#include "mash/wm/public/interfaces/user_window_controller.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/interface_factory_impl.h"
 
 namespace ui {
 namespace mojo {
 class UIInit;
 }
 }
 
 namespace views {
 class AuraInit;
 }
 
 namespace mash {
 namespace wm {
 
 class AcceleratorRegistrarImpl;
 class BackgroundLayout;
 class ShadowController;
 class ShelfLayout;
+class UserWindowControllerImpl;
 class WindowLayout;
 class WindowManagerImpl;
 
 class WindowManagerApplication
     : public mojo::ApplicationDelegate,
       public mus::WindowObserver,
       public mus::mojom::WindowTreeHostClient,
       public mus::WindowTreeDelegate,
+      public mojo::InterfaceFactory<mash::wm::mojom::UserWindowController>,
       public mojo::InterfaceFactory<mus::mojom::WindowManager>,
       public mojo::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   mus::Window* root() { return root_; }
 
   int window_count() { return window_count_; }
   void IncrementWindowCount() { ++window_count_; }
@@ skipping 17 matching lines @@
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
   // WindowTreeHostClient:
   void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override;
 
   // WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
 
+  // InterfaceFactory<mash::wm::mojom::UserWindowController>:
+  void Create(
+      mojo::ApplicationConnection* connection,
+      mojo::InterfaceRequest<mash::wm::mojom::UserWindowController> request)
+      override;
+
   // InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
       override;
 
   // InterfaceFactory<mus::mojom::WindowManager>:
   void Create(
       mojo::ApplicationConnection* connection,
       mojo::InterfaceRequest<mus::mojom::WindowManager> request) override;
 
@@ skipping 16 matching lines @@
 
   scoped_ptr<ui::mojo::UIInit> ui_init_;
   scoped_ptr<views::AuraInit> aura_init_;
 
   // |window_manager_| is created once OnEmbed() is called. Until that time
   // |requests_| stores any pending WindowManager interface requests.
   scoped_ptr<WindowManagerImpl> window_manager_;
   mojo::WeakBindingSet<mus::mojom::WindowManager> window_manager_binding_;
   ScopedVector<mojo::InterfaceRequest<mus::mojom::WindowManager>> 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_;
+  mojo::WeakBindingSet<mash::wm::mojom::UserWindowController>
+      user_window_controller_binding_;
+  ScopedVector<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>

[sky, 2016/01/14 00:19:21]

ScopedVector is deprecated. See the header.

+      user_window_controller_requests_;
+
   scoped_ptr<BackgroundLayout> background_layout_;
   scoped_ptr<ShelfLayout> shelf_layout_;
   scoped_ptr<WindowLayout> window_layout_;
 
   scoped_ptr<ShadowController> shadow_controller_;
 
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_