Moves RootWindowController::MoveWindowsTo to WmRootWindowController

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 81 matching lines @@
 namespace {
 
 #if defined(OS_CHROMEOS)
 // Duration for the animation that hides the boot splash screen, in
 // milliseconds.  This should be short enough in relation to
 // wm/window_animation.cc's brightness/grayscale fade animation that the login
 // wallpaper image animation isn't hidden by the splash screen animation.
 const int kBootSplashScreenHideDurationMs = 500;
 #endif
 
-float ToRelativeValue(int value, int src, int dst) {
-  return static_cast<float>(value) / static_cast<float>(src) * dst;
-}
-
-void MoveOriginRelativeToSize(const gfx::Size& src_size,
-                              const gfx::Size& dst_size,
-                              gfx::Rect* bounds_in_out) {
-  gfx::Point origin = bounds_in_out->origin();
-  bounds_in_out->set_origin(gfx::Point(
-      ToRelativeValue(origin.x(), src_size.width(), dst_size.width()),
-      ToRelativeValue(origin.y(), src_size.height(), dst_size.height())));
-}
-
-// Reparents |window| to |new_parent|.
-void ReparentWindow(aura::Window* window, aura::Window* new_parent) {
-  const gfx::Size src_size = window->parent()->bounds().size();
-  const gfx::Size dst_size = new_parent->bounds().size();
-  // Update the restore bounds to make it relative to the display.
-  wm::WindowState* state = wm::GetWindowState(window);
-  gfx::Rect restore_bounds;
-  bool has_restore_bounds = state->HasRestoreBounds();
-
-  bool update_bounds = (state->IsNormalOrSnapped() || state->IsMinimized()) &&
-                       new_parent->id() != kShellWindowId_DockedContainer;
-  gfx::Rect local_bounds;
-  if (update_bounds) {
-    local_bounds = WmWindowAura::GetAuraWindow(state->window())->bounds();
-    MoveOriginRelativeToSize(src_size, dst_size, &local_bounds);
-  }
-
-  if (has_restore_bounds) {
-    restore_bounds = state->GetRestoreBoundsInParent();
-    MoveOriginRelativeToSize(src_size, dst_size, &restore_bounds);
-  }
-
-  new_parent->AddChild(window);
-
-  // Docked windows have bounds handled by the layout manager in AddChild().
-  if (update_bounds)
-    window->SetBounds(local_bounds);
-
-  if (has_restore_bounds)
-    state->SetRestoreBoundsInParent(restore_bounds);
-}
-
-// Reparents the appropriate set of windows from |src| to |dst|.
-void ReparentAllWindows(aura::Window* src, aura::Window* dst) {
-  // Set of windows to move.
-  const int kContainerIdsToMove[] = {
-      kShellWindowId_DefaultContainer,
-      kShellWindowId_DockedContainer,
-      kShellWindowId_PanelContainer,
-      kShellWindowId_AlwaysOnTopContainer,
-      kShellWindowId_SystemModalContainer,
-      kShellWindowId_LockSystemModalContainer,
-      kShellWindowId_UnparentedControlContainer,
-      kShellWindowId_OverlayContainer,
-  };
-  const int kExtraContainerIdsToMoveInUnifiedMode[] = {
-      kShellWindowId_LockScreenContainer,
-      kShellWindowId_LockScreenWallpaperContainer,
-  };
-  std::vector<int> container_ids(
-      kContainerIdsToMove,
-      kContainerIdsToMove + arraysize(kContainerIdsToMove));
-  // Check the default_multi_display_mode because this is also necessary
-  // in trasition between mirror <-> unified mode.
-  if (Shell::GetInstance()
-          ->display_manager()
-          ->current_default_multi_display_mode() == DisplayManager::UNIFIED) {
-    for (int id : kExtraContainerIdsToMoveInUnifiedMode)
-      container_ids.push_back(id);
-  }
-
-  for (int id : container_ids) {
-    aura::Window* src_container = Shell::GetContainer(src, id);
-    aura::Window* dst_container = Shell::GetContainer(dst, id);
-    while (!src_container->children().empty()) {
-      // Restart iteration from the source container windows each time as they
-      // may change as a result of moving other windows.
-      aura::Window::Windows::const_iterator iter =
-          src_container->children().begin();
-      while (iter != src_container->children().end() &&
-             SystemModalContainerLayoutManager::IsModalBackground(
-                 WmWindowAura::Get(*iter))) {
-        ++iter;
-      }
-      // If the entire window list is modal background windows then stop.
-      if (iter == src_container->children().end())
-        break;
-      ReparentWindow(*iter, dst_container);
-    }
-  }
-}
-
 bool IsWindowAboveContainer(aura::Window* window,
                             aura::Window* blocking_container) {
   std::vector<aura::Window*> target_path;
   std::vector<aura::Window*> blocking_path;
 
   while (window) {
     target_path.push_back(window);
     window = window->parent();
   }
 
@@ skipping 339 matching lines @@
   // CloseChildWindows may be called twice during the shutdown of ash unittests.
   // Avoid notifying WmShelf that the shelf has been destroyed twice.
   if (wm_shelf_aura_->IsShelfInitialized())
     wm_shelf_aura_->ShutdownShelf();
 
   aura::client::SetDragDropClient(root_window, nullptr);
   aura::client::SetTooltipClient(root_window, nullptr);
 }
 
 void RootWindowController::MoveWindowsTo(aura::Window* dst) {
-  // Clear the workspace controller, so it doesn't incorrectly update the shelf.
-  wm_root_window_controller_->DeleteWorkspaceController();
-  ReparentAllWindows(GetRootWindow(), dst);
+  wm_root_window_controller_->MoveWindowsTo(WmWindowAura::Get(dst));
 }
 
 ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
   return wm_shelf_aura_->shelf_layout_manager();
 }
 
 StatusAreaWidget* RootWindowController::GetStatusAreaWidget() {
   ShelfWidget* shelf_widget = wm_shelf_aura_->shelf_widget();
   return shelf_widget ? shelf_widget->status_area_widget() : nullptr;
 }
@@ skipping 264 matching lines @@
     EnableTouchHudProjection();
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
 }
 
 }  // namespace ash