mash: Partially migrate WorkspaceController to ash common.

ash/root_window_controller.cc

 // Copyright (c) 2012 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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/aura/aura_layout_manager_adapter.h"
@@ skipping 593 matching lines @@
       delete window;
     } else {
       root_window->RemoveChild(window);
     }
   }
 
   shelf_widget_.reset();
 }
 
 void RootWindowController::MoveWindowsTo(aura::Window* dst) {
-  // Clear the shelf first, so it doesn't update itself with wrong display info.
-  workspace_controller_->SetShelf(nullptr);
+  // Clear the workspace controller, so it doesn't incorrectly update the shelf.
+  workspace_controller_.reset();
   ReparentAllWindows(GetRootWindow(), dst);
 }
 
 ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
   return shelf_widget_->shelf_layout_manager();
 }
 
 SystemTray* RootWindowController::GetSystemTray() {
   // We assume in throughout the code that this will not return NULL. If code
   // triggers this for valid reasons, it should test status_area_widget first.
@@ skipping 157 matching lines @@
     touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
   }
 #endif
 }
 
 void RootWindowController::InitLayoutManagers() {
   root_window_controller_common_->CreateLayoutManagers();
 
   aura::Window* root_window = GetRootWindow();
 
-  aura::Window* default_container =
-      GetContainer(kShellWindowId_DefaultContainer);
-  // Workspace manager has its own layout managers.
-
   aura::Window* modal_container =
       root_window->GetChildById(kShellWindowId_SystemModalContainer);
   DCHECK(modal_container);
   modal_container->SetLayoutManager(
       new SystemModalContainerLayoutManager(modal_container));
 
   aura::Window* lock_container =
       root_window->GetChildById(kShellWindowId_LockScreenContainer);
   DCHECK(lock_container);
   lock_container->SetLayoutManager(new LockLayoutManager(lock_container));
 
   aura::Window* lock_modal_container =
       root_window->GetChildById(kShellWindowId_LockSystemModalContainer);
   DCHECK(lock_modal_container);
   lock_modal_container->SetLayoutManager(
       new SystemModalContainerLayoutManager(lock_modal_container));
 
+  WmWindow* default_container =

[James Cook, 2016/08/11 23:27:35]

Thanks for cleaning this up.

[msw, 2016/08/12 00:17:15]

Acknowledged.

+      WmWindowAura::Get(GetContainer(kShellWindowId_DefaultContainer));
   workspace_controller_.reset(new WorkspaceController(default_container));
 
   WmWindow* always_on_top_container =
       WmWindowAura::Get(GetContainer(kShellWindowId_AlwaysOnTopContainer));
   always_on_top_controller_.reset(
       new AlwaysOnTopController(always_on_top_container));
 
   // Create the shelf and status area widgets.
   DCHECK(!shelf_widget_.get());
   aura::Window* shelf_container = GetContainer(kShellWindowId_ShelfContainer);
   aura::Window* status_container = GetContainer(kShellWindowId_StatusContainer);
   WmWindow* wm_shelf_container = WmWindowAura::Get(shelf_container);
   WmWindow* wm_status_container = WmWindowAura::Get(status_container);
   shelf_widget_.reset(new ShelfWidget(wm_shelf_container, wm_status_container,
-                                      wm_shelf_aura_.get(),
-                                      workspace_controller()));
+                                      wm_shelf_aura_.get()));
   // Make it easier to resize windows that partially overlap the shelf. Must
   // occur after the ShelfLayoutManager is constructed by ShelfWidget.
   shelf_container->SetEventTargeter(base::MakeUnique<ShelfWindowTargeter>(
       wm_shelf_container, wm_shelf_aura_.get()));
   status_container->SetEventTargeter(base::MakeUnique<ShelfWindowTargeter>(
       wm_status_container, wm_shelf_aura_.get()));
 
   if (!WmShell::Get()
            ->GetSessionStateDelegate()
            ->IsActiveUserSessionStarted()) {
@@ skipping 111 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash