mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash.

ash/mus/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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/root_window_controller_common.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screenlock_layout.h"
-#include "ash/mus/shelf_layout_manager.h"
 #include "ash/mus/window_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
@@ skipping 113 matching lines @@
   } else {
     // TODO(sky): likely want to constrain more than root size.
     const gfx::Size max_size = root_->bounds().size();
     width = std::max(0, std::min(max_size.width(), pref.width()));
     height = std::max(0, std::min(max_size.height(), pref.height()));
   }
   return gfx::Rect(40 + (window_count_ % 4) * 40, 40 + (window_count_ % 4) * 40,
                    width, height);
 }
 
-void RootWindowController::OnShelfWindowAvailable() {
-  DockedWindowLayoutManager* docked_window_layout_manager =
-      DockedWindowLayoutManager::Get(WmWindowMus::Get(root_));
-
-  DCHECK(!docked_window_layout_manager->shelf());
-  docked_window_layout_manager->SetShelf(wm_shelf_.get());
-
-  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::CreateLayoutManagers() {
   // Override the default layout managers for certain containers.
   WmWindowMus* lock_screen_container =
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 
-  WmWindowMus* shelf_container =
-      GetWindowByShellWindowId(kShellWindowId_ShelfContainer);
-  ShelfLayoutManager* shelf_layout_manager =
-      new ShelfLayoutManager(shelf_container->mus_window(), this);
-  layout_managers_[shelf_container->mus_window()].reset(shelf_layout_manager);
-
+  // Creating the shelf also creates the status area and both layout managers.
   wm_shelf_.reset(new WmShelfMus(wm_root_window_controller_.get()));
 
   WmWindowMus* default_container =
       GetWindowByShellWindowId(kShellWindowId_DefaultContainer);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a
   // wm::LayoutManager), so it can't be in |layout_managers_|.
   workspace_layout_manager_ = new WorkspaceLayoutManager(default_container);
   default_container->SetLayoutManager(
       base::WrapUnique(workspace_layout_manager_));
 
   WmWindowMus* docked_container =
       GetWindowByShellWindowId(kShellWindowId_DockedContainer);
-  docked_container->SetLayoutManager(
-      base::MakeUnique<DockedWindowLayoutManager>(docked_container));
+  std::unique_ptr<DockedWindowLayoutManager> docked_window_layout_manager =
+      base::MakeUnique<DockedWindowLayoutManager>(docked_container);
+  docked_window_layout_manager->SetShelf(wm_shelf_.get());
+  docked_window_layout_manager->AddObserver(wm_shelf_->shelf_layout_manager());
+  docked_container->SetLayoutManager(std::move(docked_window_layout_manager));
 
   WmWindowMus* panel_container =
       GetWindowByShellWindowId(kShellWindowId_PanelContainer);
-  panel_container->SetLayoutManager(
-      base::MakeUnique<PanelLayoutManager>(panel_container));
+  std::unique_ptr<PanelLayoutManager> panel_layout_manager =
+      base::MakeUnique<PanelLayoutManager>(panel_container);
+  panel_layout_manager->SetShelf(wm_shelf_.get());
+  panel_container->SetLayoutManager(std::move(panel_layout_manager));
 }
 
 }  // namespace mus
 }  // namespace ash