Wires up shelf to panel and dock layoutmanagers

mash/wm/root_window_controller.cc

 // Copyright 2016 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.
 
 #include "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <sstream>
@@ skipping 201 matching lines @@
 void RootWindowController::OnWindowDestroyed(mus::Window* window) {
   DCHECK_EQ(window, root_);
   app_->OnRootWindowDestroyed(this);
   root_->RemoveObserver(this);
   // Delete the |window_manager_| here so that WindowManager doesn't have to
   // worry about the possibility of |root_| being null.
   window_manager_.reset();
   root_ = nullptr;
 }
 
+void RootWindowController::OnShelfWindowAvailable() {
+  ash::DockedWindowLayoutManager::Get(WmWindowMus::Get(root_))
+      ->SetShelf(wm_shelf_.get());
+
+  ash::PanelLayoutManager::Get(WmWindowMus::Get(root_))
+      ->SetShelf(wm_shelf_.get());
+
+  // TODO: http://crbug.com/614182 Ash's ShelfLayoutManager implements
+  // DockedWindowLayoutManagerObserver so that it can inset by the docked
+  // windows.
+  // docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager());
+}
+
 void RootWindowController::CreateContainer(
     mash::wm::mojom::Container container,
     mash::wm::mojom::Container parent_container) {
   // Set the window's name to the container name (e.g. "Container::LOGIN"),
   // which makes the window hierarchy easier to read.
   std::map<std::string, std::vector<uint8_t>> properties;
   std::ostringstream container_name;
   container_name << container;
   properties[mus::mojom::WindowManager::kName_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(container_name.str());
@@ skipping 54 matching lines @@
   mus::Window* user_background =
       GetWindowForContainer(mojom::Container::USER_BACKGROUND);
   layout_managers_[user_background].reset(
       new BackgroundLayout(user_background));
 
   mus::Window* login_app = GetWindowForContainer(mojom::Container::LOGIN_APP);
   layout_managers_[login_app].reset(new ScreenlockLayout(login_app));
 
   mus::Window* user_shelf =
       GetWindowForContainer(mojom::Container::USER_PRIVATE_SHELF);
-  ShelfLayoutManager* shelf_layout_manager = new ShelfLayoutManager(user_shelf);
+  ShelfLayoutManager* shelf_layout_manager =
+      new ShelfLayoutManager(user_shelf, this);
   layout_managers_[user_shelf].reset(shelf_layout_manager);
 
   wm_shelf_.reset(new WmShelfMus(shelf_layout_manager));
 
   mus::Window* status = GetWindowForContainer(mojom::Container::STATUS);
   layout_managers_[status].reset(new StatusLayoutManager(status));
 
   mus::Window* user_private_windows =
       GetWindowForContainer(mojom::Container::USER_PRIVATE_WINDOWS);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's an
@@ skipping 18 matching lines @@
   mus::Window* user_private_panels =
       GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS);
   WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels);
   layout_managers_.erase(user_private_panels);
   user_private_panels_wm->SetLayoutManager(
       base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm)));
 }
 
 }  // namespace wm
 }  // namespace mash