Add rudimentary mash shelf functionality.

mash/wm/window_manager_impl.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_IMPL_H_
 #define MASH_WM_WINDOW_MANAGER_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
 #include "components/mus/public/cpp/window_observer.h"
+#include "components/mus/public/interfaces/user_window_controller.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 
 namespace mash {
 namespace wm {
 
 class WindowManagerApplication;
 
 using WindowManagerErrorCodeCallback =
     const mojo::Callback<void(mus::mojom::WindowManagerErrorCode)>;
 
 class WindowManagerImpl : public mus::mojom::WindowManager,
+                          public mus::mojom::UserWindowController,
                           public mus::WindowObserver,
                           public mus::WindowManagerDelegate {
  public:
   WindowManagerImpl();
   ~WindowManagerImpl() override;
 
   void Initialize(WindowManagerApplication* state);
 
  private:
   gfx::Rect CalculateDefaultBounds(mus::Window* window) const;
   gfx::Rect GetMaximizedWindowBounds() const;
 
   mus::Window* NewTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties,
       mus::mojom::WindowTreeClientPtr client);
 
   // mus::WindowObserver:
   void OnTreeChanging(const TreeChangeParams& params) override;
   void OnWindowEmbeddedAppDisconnected(mus::Window* window) override;
 
   // mus::mojom::WindowManager:
   void OpenWindow(mus::mojom::WindowTreeClientPtr client,
                   mojo::Map<mojo::String, mojo::Array<uint8_t>>
                       transport_properties) override;
   void GetConfig(const GetConfigCallback& callback) override;
 
+  // mus::mojom::UserWindowController:
+  void AddUserWindowObserver(
+      mus::mojom::UserWindowObserverPtr observer) override;
+  void FocusUserWindow(uint32_t window_id) override;
+
   // WindowManagerDelegate:
   bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(mus::Window* window,
                        const std::string& name,
                        scoped_ptr<std::vector<uint8_t>>* new_data) override;
   mus::Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
 
   WindowManagerApplication* state_;
+  mus::mojom::UserWindowObserverPtr user_window_observer_;

[sky, 2016/01/13 21:17:17]

I suspect this code will become more complex, and likely specific to the shelf.
Can you move it to its own class?

[msw, 2016/01/13 22:54:56]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
 };
 
 }  // namespace wm
 }  // namespace mash
 
 #endif  // MASH_WM_WINDOW_MANAGER_IMPL_H_