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

ash/wm/overview/window_grid.cc

 // Copyright 2014 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/overview/window_grid.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
@@ skipping 24 matching lines @@
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
 
-using Windows = std::vector<WmWindow*>;
+using Windows = aura::Window::Windows;
 
 // A comparator for locating a given target window.
 struct WindowSelectorItemComparator {
-  explicit WindowSelectorItemComparator(const WmWindow* target_window)
+  explicit WindowSelectorItemComparator(const aura::Window* target_window)
       : target(target_window) {}
 
   bool operator()(std::unique_ptr<WindowSelectorItem>& window) const {
     return window->GetWindow() == target;
   }
 
-  const WmWindow* target;
+  const aura::Window* target;
 };
 
 // Time it takes for the selector widget to move to the next target. The same
 // time is used for fading out shield widget when the overview mode is opened
 // or closed.
 const int kOverviewSelectorTransitionMilliseconds = 250;
 
 // The color and opacity of the screen shield in overview.
 const SkColor kShieldColor = SkColorSetARGB(255, 0, 0, 0);
 const float kShieldOpacity = 0.7f;
@@ skipping 141 matching lines @@
       break;
   }
   return vector;
 }
 
 // Creates and returns a background translucent widget parented in
 // |root_window|'s default container and having |background_color|.
 // When |border_thickness| is non-zero, a border is created having
 // |border_color|, otherwise |border_color| parameter is ignored.
 // The new background widget starts with |initial_opacity| and then fades in.
-views::Widget* CreateBackgroundWidget(WmWindow* root_window,
+views::Widget* CreateBackgroundWidget(aura::Window* root_window,
                                       ui::LayerType layer_type,
                                       SkColor background_color,
                                       int border_thickness,
                                       int border_radius,
                                       SkColor border_color,
                                       float initial_opacity) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_POPUP;
   params.keep_on_top = false;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.layer_type = layer_type;
   params.accept_events = false;
   widget->set_focus_on_creation(false);
   // Parenting in kShellWindowId_WallpaperContainer allows proper layering of
   // the shield and selection widgets. Since that container is created with
   // USE_LOCAL_COORDINATES BoundsInScreenBehavior local bounds in |root_window_|
   // need to be provided.
-  root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
-      widget, kShellWindowId_WallpaperContainer, &params);
+  RootWindowController::ForWindow(root_window)
+      ->ConfigureWidgetInitParamsForContainer(
+          widget, kShellWindowId_WallpaperContainer, &params);
   widget->Init(params);
-  WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow());
+  aura::Window* widget_window = widget->GetNativeWindow();
   // Disable the "bounce in" animation when showing the window.
-  widget_window->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
+  ::wm::SetWindowVisibilityAnimationTransition(widget_window,
+                                               ::wm::ANIMATE_NONE);
   // The background widget should not activate the shelf when passing under it.
-  widget_window->GetWindowState()->set_ignored_by_shelf(true);
+  wm::GetWindowState(widget_window)->set_ignored_by_shelf(true);
   if (params.layer_type == ui::LAYER_SOLID_COLOR) {
-    widget_window->GetLayer()->SetColor(background_color);
+    widget_window->layer()->SetColor(background_color);
   } else {
     views::View* content_view =
         new RoundedRectView(border_radius, SK_ColorTRANSPARENT);
     content_view->set_background(new BackgroundWith1PxBorder(
         background_color, border_color, border_thickness, border_radius));
     widget->SetContentsView(content_view);
   }
-  widget_window->GetParent()->StackChildAtTop(widget_window);
+  widget_window->parent()->StackChildAtTop(widget_window);
   widget->Show();
-  widget_window->SetOpacity(initial_opacity);
+  widget_window->layer()->SetOpacity(initial_opacity);
   return widget;
 }
 
 bool IsMinimizedStateType(wm::WindowStateType type) {
   return type == wm::WINDOW_STATE_TYPE_MINIMIZED;
 }
 
 }  // namespace
 
-WindowGrid::WindowGrid(WmWindow* root_window,
-                       const std::vector<WmWindow*>& windows,
+WindowGrid::WindowGrid(aura::Window* root_window,
+                       const std::vector<aura::Window*>& windows,
                        WindowSelector* window_selector)
     : root_window_(root_window),
       window_selector_(window_selector),
       window_observer_(this),
       window_state_observer_(this),
       selected_index_(0),
       num_columns_(0),
       prepared_for_overview_(false) {
-  std::vector<WmWindow*> windows_in_root;
+  aura::Window::Windows windows_in_root;
   for (auto* window : windows) {
     if (window->GetRootWindow() == root_window)
       windows_in_root.push_back(window);
   }
 
   for (auto* window : windows_in_root) {
-    window_observer_.Add(window->aura_window());
-    window_state_observer_.Add(window->GetWindowState());
+    window_observer_.Add(window);
+    window_state_observer_.Add(wm::GetWindowState(window));
     window_list_.push_back(
         base::MakeUnique<WindowSelectorItem>(window, window_selector_));
   }
 }
 
 WindowGrid::~WindowGrid() {}
 
 void WindowGrid::Shutdown() {
   for (const auto& window : window_list_)
     window->Shutdown();
 
   if (shield_widget_) {
     // Fade out the shield widget. This animation continues past the lifetime
     // of |this|.
-    WmWindow* widget_window = WmWindow::Get(shield_widget_->GetNativeWindow());
+    aura::Window* widget_window = shield_widget_->GetNativeWindow();
     ui::ScopedLayerAnimationSettings animation_settings(
-        widget_window->GetLayer()->GetAnimator());
+        widget_window->layer()->GetAnimator());
     animation_settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kOverviewSelectorTransitionMilliseconds));
     animation_settings.SetTweenType(gfx::Tween::EASE_OUT);
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     // CleanupAnimationObserver will delete itself (and the shield widget) when
     // the opacity animation is complete.
     // Ownership over the observer is passed to the window_selector_->delegate()
     // which has longer lifetime so that animations can continue even after the
     // overview mode is shut down.
@@ skipping 12 matching lines @@
   for (const auto& window : window_list_)
     window->PrepareForOverview();
   prepared_for_overview_ = true;
 }
 
 void WindowGrid::PositionWindows(bool animate) {
   if (window_selector_->is_shut_down() || window_list_.empty())
     return;
   DCHECK(shield_widget_.get());
   // Keep the background shield widget covering the whole screen.
-  WmWindow* widget_window = WmWindow::Get(shield_widget_->GetNativeWindow());
-  const gfx::Rect bounds = widget_window->GetParent()->GetBounds();
+  aura::Window* widget_window = shield_widget_->GetNativeWindow();
+  const gfx::Rect bounds = widget_window->parent()->bounds();
   widget_window->SetBounds(bounds);
-  gfx::Rect total_bounds = root_window_->ConvertRectToScreen(
-      ScreenUtil::GetDisplayWorkAreaBoundsInParent(
-          root_window_->GetChildByShellWindowId(kShellWindowId_DefaultContainer)
-              ->aura_window()));
+  gfx::Rect total_bounds = ScreenUtil::GetDisplayWorkAreaBoundsInParent(
+      root_window_->GetChildById(kShellWindowId_DefaultContainer));
+  ::wm::ConvertRectToScreen(root_window_, &total_bounds);
   // Windows occupy vertically centered area with additional vertical insets.
   int horizontal_inset =
       gfx::ToFlooredInt(std::min(kOverviewInsetRatio * total_bounds.width(),
                                  kOverviewInsetRatio * total_bounds.height()));
   int vertical_inset =
       horizontal_inset +
       kOverviewVerticalInset * (total_bounds.height() - 2 * horizontal_inset);
   total_bounds.Inset(std::max(0, horizontal_inset - kWindowMargin),
                      std::max(0, vertical_inset - kWindowMargin));
   std::vector<gfx::Rect> rects;
@@ skipping 161 matching lines @@
   return out_of_bounds;
 }
 
 WindowSelectorItem* WindowGrid::SelectedWindow() const {
   if (!selection_widget_)
     return nullptr;
   CHECK(selected_index_ < window_list_.size());
   return window_list_[selected_index_].get();
 }
 
-bool WindowGrid::Contains(const WmWindow* window) const {
+bool WindowGrid::Contains(const aura::Window* window) const {
   for (const auto& window_item : window_list_) {
     if (window_item->Contains(window))
       return true;
   }
   return false;
 }
 
 void WindowGrid::FilterItems(const base::string16& pattern) {
   base::i18n::FixedPatternStringSearchIgnoringCaseAndAccents finder(pattern);
   for (const auto& window : window_list_) {
-    if (finder.Search(window->GetWindow()->aura_window()->GetTitle(), nullptr,
-                      nullptr)) {
+    if (finder.Search(window->GetWindow()->GetTitle(), nullptr, nullptr)) {
       window->SetDimmed(false);
     } else {
       window->SetDimmed(true);
       if (selection_widget_ && SelectedWindow() == window.get()) {
         SelectedWindow()->SetSelected(false);
         selection_widget_.reset();
         selector_shadow_.reset();
       }
     }
   }
 }
 
 void WindowGrid::WindowClosing(WindowSelectorItem* window) {
   if (!selection_widget_ || SelectedWindow() != window)
     return;
-  WmWindow* selection_widget_window =
-      WmWindow::Get(selection_widget_->GetNativeWindow());
+  aura::Window* selection_widget_window = selection_widget_->GetNativeWindow();
   std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
       ScopedOverviewAnimationSettingsFactory::Get()
           ->CreateOverviewAnimationSettings(
               OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM,
               selection_widget_window);
   selection_widget_->SetOpacity(0.f);
 }
 
 void WindowGrid::OnWindowDestroying(aura::Window* window) {
   window_observer_.Remove(window);
   window_state_observer_.Remove(wm::GetWindowState(window));
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
-                           WindowSelectorItemComparator(WmWindow::Get(window)));
+                           WindowSelectorItemComparator(window));
 
   DCHECK(iter != window_list_.end());
 
   size_t removed_index = iter - window_list_.begin();
   window_list_.erase(iter);
 
   if (empty()) {
     // If the grid is now empty, notify the window selector so that it erases us
     // from its grid list.
     window_selector_->OnGridEmpty(this);
@@ skipping 15 matching lines @@
 
 void WindowGrid::OnWindowBoundsChanged(aura::Window* window,
                                        const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   // During preparation, window bounds can change. Ignore bounds
   // change notifications in this case; we'll reposition soon.
   if (!prepared_for_overview_)
     return;
 
   auto iter = std::find_if(window_list_.begin(), window_list_.end(),
-                           WindowSelectorItemComparator(WmWindow::Get(window)));
+                           WindowSelectorItemComparator(window));
   DCHECK(iter != window_list_.end());
 
   // Immediately finish any active bounds animation.
   window->layer()->GetAnimator()->StopAnimatingProperty(
       ui::LayerAnimationElement::BOUNDS);
   PositionWindows(false);
 }
 
 void WindowGrid::OnPostWindowStateTypeChange(wm::WindowState* window_state,
                                              wm::WindowStateType old_type) {
   // During preparation, window state can change, e.g. updating shelf
   // visibility may show the temporarily hidden (minimized) panels.
   if (!prepared_for_overview_)
     return;
 
   wm::WindowStateType new_type = window_state->GetStateType();
   if (IsMinimizedStateType(old_type) == IsMinimizedStateType(new_type))
     return;
 
-  auto iter = std::find_if(
-      window_list_.begin(), window_list_.end(),
-      [window_state](std::unique_ptr<WindowSelectorItem>& item) {
-        return item->Contains(WmWindow::Get(window_state->window()));
-      });
+  auto iter =
+      std::find_if(window_list_.begin(), window_list_.end(),
+                   [window_state](std::unique_ptr<WindowSelectorItem>& item) {
+                     return item->Contains(window_state->window());
+                   });
   if (iter != window_list_.end()) {
     (*iter)->OnMinimizedStateChanged();
     PositionWindows(false);
   }
 }
 
 void WindowGrid::InitShieldWidget() {
   // TODO(varkha): The code assumes that SHELF_BACKGROUND_MAXIMIZED is
   // synonymous with a black shelf background. Update this code if that
   // assumption is no longer valid.
   const float initial_opacity =
-      (WmShelf::ForWindow(root_window_->aura_window())->GetBackgroundType() ==
+      (WmShelf::ForWindow(root_window_)->GetBackgroundType() ==
        SHELF_BACKGROUND_MAXIMIZED)
           ? 1.f
           : 0.f;
   shield_widget_.reset(
       CreateBackgroundWidget(root_window_, ui::LAYER_SOLID_COLOR, kShieldColor,
                              0, 0, SK_ColorTRANSPARENT, initial_opacity));
-  WmWindow* widget_window = WmWindow::Get(shield_widget_->GetNativeWindow());
-  const gfx::Rect bounds = widget_window->GetParent()->GetBounds();
+  aura::Window* widget_window = shield_widget_->GetNativeWindow();
+  const gfx::Rect bounds = widget_window->parent()->bounds();
   widget_window->SetBounds(bounds);
-  widget_window->aura_window()->SetName("OverviewModeShield");
+  widget_window->SetName("OverviewModeShield");
 
   ui::ScopedLayerAnimationSettings animation_settings(
-      widget_window->GetLayer()->GetAnimator());
+      widget_window->layer()->GetAnimator());
   animation_settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
       kOverviewSelectorTransitionMilliseconds));
   animation_settings.SetTweenType(gfx::Tween::EASE_OUT);
   animation_settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   shield_widget_->SetOpacity(kShieldOpacity);
 }
 
 void WindowGrid::InitSelectionWidget(WindowSelector::Direction direction) {
   selection_widget_.reset(CreateBackgroundWidget(
       root_window_, ui::LAYER_TEXTURED, kWindowSelectionColor,
       kWindowSelectionBorderThickness, kWindowSelectionRadius,
       kWindowSelectionBorderColor, 0.f));
-  WmWindow* widget_window = WmWindow::Get(selection_widget_->GetNativeWindow());
-  const gfx::Rect target_bounds =
-      root_window_->ConvertRectFromScreen(SelectedWindow()->target_bounds());
+  aura::Window* widget_window = selection_widget_->GetNativeWindow();
+  gfx::Rect target_bounds = SelectedWindow()->target_bounds();
+  ::wm::ConvertRectFromScreen(root_window_, &target_bounds);
   gfx::Vector2d fade_out_direction =
       GetSlideVectorForFadeIn(direction, target_bounds);
   widget_window->SetBounds(target_bounds - fade_out_direction);
-  widget_window->aura_window()->SetName("OverviewModeSelector");
+  widget_window->SetName("OverviewModeSelector");
 
   selector_shadow_.reset(new ::wm::Shadow());
   selector_shadow_->Init(::wm::ShadowElevation::LARGE);
   selector_shadow_->layer()->SetVisible(true);
   selection_widget_->GetLayer()->SetMasksToBounds(false);
   selection_widget_->GetLayer()->Add(selector_shadow_->layer());
   selector_shadow_->SetContentBounds(gfx::Rect(target_bounds.size()));
 }
 
 void WindowGrid::MoveSelectionWidget(WindowSelector::Direction direction,
                                      bool recreate_selection_widget,
                                      bool out_of_bounds,
                                      bool animate) {
   // If the selection widget is already active, fade it out in the selection
   // direction.
   if (selection_widget_ && (recreate_selection_widget || out_of_bounds)) {
     // Animate the old selection widget and then destroy it.
     views::Widget* old_selection = selection_widget_.get();
-    WmWindow* old_selection_window =
-        WmWindow::Get(old_selection->GetNativeWindow());
+    aura::Window* old_selection_window = old_selection->GetNativeWindow();
     gfx::Vector2d fade_out_direction =
-        GetSlideVectorForFadeIn(direction, old_selection_window->GetBounds());
+        GetSlideVectorForFadeIn(direction, old_selection_window->bounds());
 
     ui::ScopedLayerAnimationSettings animation_settings(
-        old_selection_window->GetLayer()->GetAnimator());
+        old_selection_window->layer()->GetAnimator());
     animation_settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kOverviewSelectorTransitionMilliseconds));
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     animation_settings.SetTweenType(gfx::Tween::FAST_OUT_LINEAR_IN);
     // CleanupAnimationObserver will delete itself (and the widget) when the
     // motion animation is complete.
     // Ownership over the observer is passed to the window_selector_->delegate()
     // which has longer lifetime so that animations can continue even after the
     // overview mode is shut down.
     std::unique_ptr<CleanupAnimationObserver> observer(
         new CleanupAnimationObserver(std::move(selection_widget_)));
     animation_settings.AddObserver(observer.get());
     window_selector_->delegate()->AddDelayedAnimationObserver(
         std::move(observer));
     old_selection->SetOpacity(0.f);
-    old_selection_window->SetBounds(old_selection_window->GetBounds() +
+    old_selection_window->SetBounds(old_selection_window->bounds() +
                                     fade_out_direction);
     old_selection->Hide();
   }
   if (out_of_bounds)
     return;
 
   if (!selection_widget_)
     InitSelectionWidget(direction);
   // Send an a11y alert so that if ChromeVox is enabled, the item label is
   // read.
   SelectedWindow()->SendAccessibleSelectionEvent();
   // The selection widget is moved to the newly selected item in the same
   // grid.
   MoveSelectionWidgetToTarget(animate);
 }
 
 void WindowGrid::MoveSelectionWidgetToTarget(bool animate) {
-  gfx::Rect bounds =
-      root_window_->ConvertRectFromScreen(SelectedWindow()->target_bounds());
+  gfx::Rect bounds = SelectedWindow()->target_bounds();
+  ::wm::ConvertRectFromScreen(root_window_, &bounds);
   if (animate) {
-    WmWindow* selection_widget_window =
-        WmWindow::Get(selection_widget_->GetNativeWindow());
+    aura::Window* selection_widget_window =
+        selection_widget_->GetNativeWindow();
     ui::ScopedLayerAnimationSettings animation_settings(
-        selection_widget_window->GetLayer()->GetAnimator());
+        selection_widget_window->layer()->GetAnimator());
     animation_settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kOverviewSelectorTransitionMilliseconds));
     animation_settings.SetTweenType(gfx::Tween::EASE_IN_OUT);
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     selection_widget_->SetBounds(bounds);
     selection_widget_->SetOpacity(1.f);
 
     if (selector_shadow_) {
       ui::ScopedLayerAnimationSettings animation_settings_shadow(
@@ skipping 80 matching lines @@
         *min_right = left;
       if (*max_right < left)
         *max_right = left;
     }
     *max_bottom = top + height;
   }
   return windows_fit;
 }
 
 }  // namespace ash