[mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode

ash/wm/window_positioner.cc

 // Copyright 2013 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/wm/window_positioner.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 const int WindowPositioner::kMinimumWindowOffset = 32;
 
 // The number of pixels which are kept free top, left and right when a window
 // gets positioned to its default location.
 // static
 const int WindowPositioner::kDesktopBorderSize = 16;
 
@@ skipping 13 matching lines @@
 const int kWindowAutoMoveDurationMS = 125;
 
 // If set to true all window repositioning actions will be ignored. Set through
 // WindowPositioner::SetIgnoreActivations().
 static bool disable_auto_positioning = false;
 
 // If set to true, by default the first window in ASH will be maximized.
 static bool maximize_first_window = false;
 
 // Check if any management should be performed (with a given |window|).
-bool UseAutoWindowManager(const WmWindow* window) {
+bool UseAutoWindowManager(const aura::Window* window) {
   if (disable_auto_positioning)
     return false;
-  const wm::WindowState* window_state = window->GetWindowState();
+  const wm::WindowState* window_state = wm::GetWindowState(window);
   return !window_state->is_dragged() && window_state->window_position_managed();
 }
 
 // Check if a given |window| can be managed. This includes that its
 // state is not minimized/maximized/fullscreen/the user has changed
 // its size by hand already. It furthermore checks for the
 // WindowIsManaged status.
-bool WindowPositionCanBeManaged(const WmWindow* window) {
+bool WindowPositionCanBeManaged(const aura::Window* window) {
   if (disable_auto_positioning)
     return false;
-  const wm::WindowState* window_state = window->GetWindowState();
+  const wm::WindowState* window_state = wm::GetWindowState(window);
   return window_state->window_position_managed() &&
          !window_state->IsMinimized() && !window_state->IsMaximized() &&
          !window_state->IsFullscreen() && !window_state->IsPinned() &&
          !window_state->bounds_changed_by_user();
 }
 
 // Move the given |bounds| on the available |work_area| in the direction
 // indicated by |move_right|. If |move_right| is true, the rectangle gets moved
 // to the right edge, otherwise to the left one.
 bool MoveRectToOneSide(const gfx::Rect& work_area,
                        bool move_right,
                        gfx::Rect* bounds) {
   if (move_right) {
     if (work_area.right() > bounds->right()) {
       bounds->set_x(work_area.right() - bounds->width());
       return true;
     }
   } else {
     if (work_area.x() < bounds->x()) {
       bounds->set_x(work_area.x());
       return true;
     }
   }
   return false;
 }
 
 // Move a |window| to new |bounds|. Animate if desired by user.
 // Moves the transient children of the |window| as well by the same |offset| as
 // the parent |window|.
-void SetBoundsAndOffsetTransientChildren(WmWindow* window,
+void SetBoundsAndOffsetTransientChildren(aura::Window* window,
                                          const gfx::Rect& bounds,
                                          const gfx::Rect& work_area,
                                          const gfx::Vector2d& offset) {
-  std::vector<WmWindow*> transient_children = window->GetTransientChildren();
-  for (WmWindow* transient_child : transient_children) {
-    gfx::Rect child_bounds = transient_child->GetBounds();
+  std::vector<aura::Window*> transient_children =

[msw, 2017/05/23 22:50:25]

ditto

[varkha, 2017/05/24 15:29:15]

Done.

+      ::wm::GetTransientChildren(window);
+  for (auto* transient_child : transient_children) {
+    gfx::Rect child_bounds = transient_child->bounds();
     gfx::Rect new_child_bounds = child_bounds + offset;
     if ((child_bounds.x() <= work_area.x() &&
          new_child_bounds.x() <= work_area.x()) ||
         (child_bounds.right() >= work_area.right() &&
          new_child_bounds.right() >= work_area.right())) {
       continue;
     }
     if (new_child_bounds.right() > work_area.right())
       new_child_bounds.set_x(work_area.right() - bounds.width());
     else if (new_child_bounds.x() < work_area.x())
       new_child_bounds.set_x(work_area.x());
     SetBoundsAndOffsetTransientChildren(transient_child, new_child_bounds,
                                         work_area, offset);
   }
 
-  window->SetBoundsWithTransitionDelay(
-      bounds, base::TimeDelta::FromMilliseconds(kWindowAutoMoveDurationMS));
+  if (::wm::WindowAnimationsDisabled(window)) {
+    window->SetBounds(bounds);
+    return;
+  }
+
+  ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
+  settings.SetTransitionDuration(
+      base::TimeDelta::FromMilliseconds(kWindowAutoMoveDurationMS));
+  window->SetBounds(bounds);
 }
 
 // Move a |window| to new |bounds|. Animate if desired by user.
 // Note: The function will do nothing if the bounds did not change.
-void SetBoundsAnimated(WmWindow* window,
+void SetBoundsAnimated(aura::Window* window,
                        const gfx::Rect& bounds,
                        const gfx::Rect& work_area) {
   gfx::Rect old_bounds = window->GetTargetBounds();
   if (bounds == old_bounds)
     return;
   gfx::Vector2d offset(bounds.origin() - old_bounds.origin());
   SetBoundsAndOffsetTransientChildren(window, bounds, work_area, offset);
 }
 
 // Move |window| into the center of the screen - or restore it to the previous
 // position.
-void AutoPlaceSingleWindow(WmWindow* window, bool animated) {
-  gfx::Rect work_area =
-      ScreenUtil::GetDisplayWorkAreaBoundsInParent(window->aura_window());
-  gfx::Rect bounds = window->GetBounds();
+void AutoPlaceSingleWindow(aura::Window* window, bool animated) {
+  gfx::Rect work_area = ScreenUtil::GetDisplayWorkAreaBoundsInParent(window);
+  gfx::Rect bounds = window->bounds();
   const gfx::Rect* user_defined_area =
-      window->GetWindowState()->pre_auto_manage_window_bounds();
+      wm::GetWindowState(window)->pre_auto_manage_window_bounds();
   if (user_defined_area) {
     bounds = *user_defined_area;
     wm::AdjustBoundsToEnsureMinimumWindowVisibility(work_area, &bounds);
   } else {
     // Center the window (only in x).
     bounds.set_x(work_area.x() + (work_area.width() - bounds.width()) / 2);
   }
 
   if (animated)
     SetBoundsAnimated(window, bounds, work_area);
   else
     window->SetBounds(bounds);
 }
 
 // Get the first open (non minimized) window which is on the screen defined.
-WmWindow* GetReferenceWindow(const WmWindow* root_window,
-                             const WmWindow* exclude,
-                             bool* single_window) {
+aura::Window* GetReferenceWindow(const aura::Window* root_window,
+                                 const aura::Window* exclude,
+                                 bool* single_window) {
   if (single_window)
     *single_window = true;
   // Get the active window.
-  WmWindow* active = WmWindow::Get(wm::GetActiveWindow());
+  aura::Window* active = wm::GetActiveWindow();
   if (active && active->GetRootWindow() != root_window)
     active = NULL;
 
   // Get a list of all windows.
-  const std::vector<WmWindow*> windows =
+  const std::vector<aura::Window*> windows =

[msw, 2017/05/23 22:50:25]

ditto

[varkha, 2017/05/24 15:29:15]

Done.

       Shell::Get()->mru_window_tracker()->BuildWindowListIgnoreModal();
 
   if (windows.empty())
     return nullptr;
 
   int index = 0;
   // Find the index of the current active window.
   if (active)
     index = std::find(windows.begin(), windows.end(), active) - windows.begin();
 
   // Scan the cycle list backwards to see which is the second topmost window
   // (and so on). Note that we might cycle a few indices twice if there is no
   // suitable window. However - since the list is fairly small this should be
   // very fast anyways.
-  WmWindow* found = nullptr;
+  aura::Window* found = nullptr;
   for (int i = index + windows.size(); i >= 0; i--) {
-    WmWindow* window = windows[i % windows.size()];
-    while (window->GetTransientParent())
-      window = window->GetTransientParent();
-    if (window != exclude && window->GetType() == ui::wm::WINDOW_TYPE_NORMAL &&
-        window->GetRootWindow() == root_window &&
-        window->GetTargetVisibility() &&
-        window->GetWindowState()->window_position_managed()) {
+    aura::Window* window = windows[i % windows.size()];
+    while (::wm::GetTransientParent(window))
+      window = ::wm::GetTransientParent(window);
+    if (window != exclude && window->type() == ui::wm::WINDOW_TYPE_NORMAL &&
+        window->GetRootWindow() == root_window && window->TargetVisibility() &&
+        wm::GetWindowState(window)->window_position_managed()) {
       if (found && found != window) {
         // no need to check !single_window because the function must have
         // been already returned in the "if (!single_window)" below.
         *single_window = false;
         return found;
       }
       found = window;
       // If there is no need to check single window, return now.
       if (!single_window)
         return found;
     }
   }
   return found;
 }
 
 }  // namespace
 
 // static
 int WindowPositioner::GetForceMaximizedWidthLimit() {
   return kForceMaximizeWidthLimit;
 }
 
 // static
 void WindowPositioner::GetBoundsAndShowStateForNewWindow(
-    const WmWindow* new_window,
+    const aura::Window* new_window,
     bool is_saved_bounds,
     ui::WindowShowState show_state_in,
     gfx::Rect* bounds_in_out,
     ui::WindowShowState* show_state_out) {
   // Always open new window in the target display.
   aura::Window* target = Shell::GetRootWindowForNewWindows();
 
-  WmWindow* top_window =
-      GetReferenceWindow(WmWindow::Get(target), nullptr, nullptr);
+  aura::Window* top_window = GetReferenceWindow(target, nullptr, nullptr);
   // Our window should not have any impact if we are already on top.
   if (top_window == new_window)
     top_window = nullptr;
 
   // If there is no valid other window we take and adjust the passed coordinates
   // and show state.
   if (!top_window) {
     gfx::Rect work_area = display::Screen::GetScreen()
                               ->GetDisplayNearestWindow(target)
                               .work_area();
 
     bounds_in_out->AdjustToFit(work_area);
     // Use adjusted saved bounds, if there is one.
     if (is_saved_bounds)
       return;
 
     if (show_state_in == ui::SHOW_STATE_DEFAULT) {
       const bool maximize_first_window_on_first_run =
           ShellPort::Get()->IsForceMaximizeOnFirstRun();
       // We want to always open maximized on "small screens" or when policy
       // tells us to.
       const bool set_maximized =
           maximize_first_window ||
           ((work_area.width() <= GetForceMaximizedWidthLimit() ||
             maximize_first_window_on_first_run) &&
-           (!new_window || !new_window->GetWindowState()->IsFullscreen()));
+           (!new_window || !wm::GetWindowState(new_window)->IsFullscreen()));
 
       if (set_maximized)
         *show_state_out = ui::SHOW_STATE_MAXIMIZED;
     }
     return;
   }
 
-  wm::WindowState* top_window_state = top_window->GetWindowState();
+  wm::WindowState* top_window_state = wm::GetWindowState(top_window);
   bool maximized = top_window_state->IsMaximized();
   // We ignore the saved show state, but look instead for the top level
   // window's show state.
   if (show_state_in == ui::SHOW_STATE_DEFAULT) {
     *show_state_out =
         maximized ? ui::SHOW_STATE_MAXIMIZED : ui::SHOW_STATE_DEFAULT;
   }
 
   if (maximized || top_window_state->IsFullscreen()) {
     bool has_restore_bounds = top_window_state->HasRestoreBounds();
@@ skipping 16 matching lines @@
     }
   }
 
   // Use the size of the other window. The window's bound will be rearranged
   // in ash::WorkspaceLayoutManager using this location.
   *bounds_in_out = top_window->GetBoundsInScreen();
 }
 
 // static
 void WindowPositioner::RearrangeVisibleWindowOnHideOrRemove(
-    const WmWindow* removed_window) {
+    const aura::Window* removed_window) {
   if (!UseAutoWindowManager(removed_window))
     return;
   // Find a single open browser window.
   bool single_window;
-  WmWindow* other_shown_window = GetReferenceWindow(
+  aura::Window* other_shown_window = GetReferenceWindow(
       removed_window->GetRootWindow(), removed_window, &single_window);
   if (!other_shown_window || !single_window ||
       !WindowPositionCanBeManaged(other_shown_window))
     return;
   AutoPlaceSingleWindow(other_shown_window, true);
 }
 
 // static
 bool WindowPositioner::DisableAutoPositioning(bool ignore) {
   bool old_state = disable_auto_positioning;
   disable_auto_positioning = ignore;
   return old_state;
 }
 
 // static
-void WindowPositioner::RearrangeVisibleWindowOnShow(WmWindow* added_window) {
-  wm::WindowState* added_window_state = added_window->GetWindowState();
-  if (!added_window->GetTargetVisibility())
+void WindowPositioner::RearrangeVisibleWindowOnShow(
+    aura::Window* added_window) {
+  wm::WindowState* added_window_state = wm::GetWindowState(added_window);
+  if (!added_window->TargetVisibility())
     return;
 
   if (!UseAutoWindowManager(added_window) ||
       added_window_state->bounds_changed_by_user()) {
     if (added_window_state->minimum_visibility()) {
       // Guarantee minimum visibility within the work area.
-      gfx::Rect work_area = ScreenUtil::GetDisplayWorkAreaBoundsInParent(
-          added_window->aura_window());
-      gfx::Rect bounds = added_window->GetBounds();
+      gfx::Rect work_area =
+          ScreenUtil::GetDisplayWorkAreaBoundsInParent(added_window);
+      gfx::Rect bounds = added_window->bounds();
       gfx::Rect new_bounds = bounds;
       wm::AdjustBoundsToEnsureMinimumWindowVisibility(work_area, &new_bounds);
       if (new_bounds != bounds)
         added_window->SetBounds(new_bounds);
     }
     return;
   }
   // Find a single open managed window.
   bool single_window;
-  WmWindow* other_shown_window = GetReferenceWindow(
+  aura::Window* other_shown_window = GetReferenceWindow(
       added_window->GetRootWindow(), added_window, &single_window);
 
   if (!other_shown_window) {
     // It could be that this window is the first window joining the workspace.
     if (!WindowPositionCanBeManaged(added_window) || other_shown_window)
       return;
     // Since we might be going from 0 to 1 window, we have to arrange the new
     // window to a good default.
     AutoPlaceSingleWindow(added_window, false);
     return;
   }
 
-  gfx::Rect other_bounds = other_shown_window->GetBounds();
+  gfx::Rect other_bounds = other_shown_window->bounds();
   gfx::Rect work_area =
-      ScreenUtil::GetDisplayWorkAreaBoundsInParent(added_window->aura_window());
+      ScreenUtil::GetDisplayWorkAreaBoundsInParent(added_window);
   bool move_other_right =
       other_bounds.CenterPoint().x() > work_area.x() + work_area.width() / 2;
 
   // Push the other window to the size only if there are two windows left.
   if (single_window) {
     // When going from one to two windows both windows loose their
     // "positioned by user" flags.
     added_window_state->set_bounds_changed_by_user(false);
-    wm::WindowState* other_window_state = other_shown_window->GetWindowState();
+    wm::WindowState* other_window_state =
+        wm::GetWindowState(other_shown_window);
     other_window_state->set_bounds_changed_by_user(false);
 
     if (WindowPositionCanBeManaged(other_shown_window)) {
       // Don't override pre auto managed bounds as the current bounds
       // may not be original.
       if (!other_window_state->pre_auto_manage_window_bounds())
         other_window_state->SetPreAutoManageWindowBounds(other_bounds);
 
       // Push away the other window after remembering its current position.
       if (MoveRectToOneSide(work_area, move_other_right, &other_bounds))
         SetBoundsAnimated(other_shown_window, other_bounds, work_area);
     }
   }
 
   // Remember the current location of the window if it's new and push
   // it also to the opposite location if needed.  Since it is just
   // being shown, we do not need to animate it.
-  gfx::Rect added_bounds = added_window->GetBounds();
+  gfx::Rect added_bounds = added_window->bounds();
   if (!added_window_state->pre_auto_manage_window_bounds())
     added_window_state->SetPreAutoManageWindowBounds(added_bounds);
   if (MoveRectToOneSide(work_area, !move_other_right, &added_bounds))
     added_window->SetBounds(added_bounds);
 }
 
 WindowPositioner::WindowPositioner()
     : pop_position_offset_increment_x(0),
       pop_position_offset_increment_y(0),
       popup_position_offset_from_screen_corner_x(0),
@@ skipping 87 matching lines @@
   if (!reset) {
     last_popup_position_x_ += pop_position_offset_increment_x;
     last_popup_position_y_ += pop_position_offset_increment_y;
   }
   return gfx::Rect(x + work_area.x(), y + work_area.y(), w, h);
 }
 
 gfx::Rect WindowPositioner::SmartPopupPosition(const gfx::Rect& old_pos,
                                                const gfx::Rect& work_area,
                                                int grid) {
-  const std::vector<WmWindow*> windows =
+  const std::vector<aura::Window*> windows =

[msw, 2017/05/23 22:50:25]

ditto

[varkha, 2017/05/24 15:29:15]

Done.

       Shell::Get()->mru_window_tracker()->BuildWindowListIgnoreModal();
 
   std::vector<const gfx::Rect*> regions;
   // Process the window list and check if we can bail immediately.
   for (size_t i = 0; i < windows.size(); i++) {
     // We only include opaque and visible windows.
-    if (windows[i] && windows[i]->IsVisible() && windows[i]->GetLayer() &&
-        (windows[i]->GetLayer()->fills_bounds_opaquely() ||
-         windows[i]->GetLayer()->GetTargetOpacity() == 1.0)) {
-      wm::WindowState* window_state = windows[i]->GetWindowState();
+    if (windows[i] && windows[i]->IsVisible() && windows[i]->layer() &&
+        (windows[i]->layer()->fills_bounds_opaquely() ||
+         windows[i]->layer()->GetTargetOpacity() == 1.0)) {
+      wm::WindowState* window_state = wm::GetWindowState(windows[i]);
       // When any window is maximized we cannot find any free space.
       if (window_state->IsMaximizedOrFullscreenOrPinned())
         return gfx::Rect(0, 0, 0, 0);
       if (window_state->IsNormalOrSnapped())
-        regions.push_back(&windows[i]->GetBounds());
+        regions.push_back(&windows[i]->bounds());
     }
   }
 
   if (regions.empty())
     return gfx::Rect(0, 0, 0, 0);
 
   int w = old_pos.width();
   int h = old_pos.height();
   int x_end = work_area.width() / 2;
   int x, x_increment;
@@ skipping 49 matching lines @@
   // If the alignment was pushing the window out of the screen, we ignore the
   // alignment for that call.
   if (abs(pos.right() - work_area.right()) < grid)
     x = work_area.right() - w;
   if (abs(pos.bottom() - work_area.bottom()) < grid)
     y = work_area.bottom() - h;
   return gfx::Rect(x, y, w, h);
 }
 
 }  // namespace ash