mash: Add status area container to mash window manager

mash/wm/shelf_layout_impl.h

Index: mash/wm/shelf_layout_impl.h
diff --git a/mash/wm/shelf_layout.h b/mash/wm/shelf_layout_impl.h
similarity index 50%
copy from mash/wm/shelf_layout.h
copy to mash/wm/shelf_layout_impl.h
index ccef7da3331b357e6c69a34595c7747128eededf..d72f5e2f6e355ff7c9b5f7c0154b98bf6f661b0f 100644
--- a/mash/wm/shelf_layout.h
+++ b/mash/wm/shelf_layout_impl.h
@@ -2,38 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_SHELF_LAYOUT_H_
-#define MASH_WM_SHELF_LAYOUT_H_
+#ifndef MASH_WM_SHELF_LAYOUT_IMPL_H_
+#define MASH_WM_SHELF_LAYOUT_IMPL_H_
 
 #include "base/macros.h"
-#include "mash/wm/layout_manager.h"
 #include "mash/wm/public/interfaces/shelf_layout.mojom.h"
 
 namespace mash {
 namespace wm {
 
-// Lays out the shelf within shelf containers.
-class ShelfLayout : public LayoutManager, public mojom::ShelfLayout {
+class RootWindowController;
+
+// Implements the ShelfLayout mojo interface to listen for layout changes from
+// the system UI application.
+class ShelfLayoutImpl : public mojom::ShelfLayout {
  public:
-  explicit ShelfLayout(mus::Window* owner);
-  ~ShelfLayout() override;
+  ShelfLayoutImpl();
+  ~ShelfLayoutImpl() override;
 
- private:
-  // Overridden from LayoutManager:
-  void LayoutWindow(mus::Window* window) override;
+  void Initialize(RootWindowController* root_controller);
 
+ private:
   // Overridden from mojom::ShelfLayout:
   void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
   void SetAutoHideBehavior(
       mash::shelf::mojom::AutoHideBehavior auto_hide) override;
 
-  mash::shelf::mojom::Alignment alignment_;
-  mash::shelf::mojom::AutoHideBehavior auto_hide_behavior_;
+  RootWindowController* root_controller_ = nullptr;
 
-  DISALLOW_COPY_AND_ASSIGN(ShelfLayout);
+  DISALLOW_COPY_AND_ASSIGN(ShelfLayoutImpl);
 };
 
 }  // namespace wm
 }  // namespace mash
 
-#endif  // MASH_WM_SHELF_LAYOUT_H_
+#endif  // MASH_WM_SHELF_LAYOUT_IMPL_H_