Add rudimentary mash shelf functionality.

mash/wm/window_manager_impl.h

Index: mash/wm/window_manager_impl.h
diff --git a/mash/wm/window_manager_impl.h b/mash/wm/window_manager_impl.h
index 38aff19e7ddb1027e8de6e55a54e820206c7867a..7c6814b7132789af753f93b2d81b80f9bb6d3bd6 100644
--- a/mash/wm/window_manager_impl.h
+++ b/mash/wm/window_manager_impl.h
@@ -11,6 +11,7 @@
 #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 {
@@ -22,6 +23,7 @@ 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:
@@ -48,6 +50,11 @@ class WindowManagerImpl : public mus::mojom::WindowManager,
                       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,
@@ -57,6 +64,7 @@ class WindowManagerImpl : public mus::mojom::WindowManager,
       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);
 };