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

ash/wm/overview/window_selector_item.cc

Index: ash/wm/overview/window_selector_item.cc
diff --git a/ash/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc
index 9356b57e9de2404ca9dc9b50e13b46933015ab0c..9775fa7d035862d0692358978544f07ae1214a4a 100644
--- a/ash/wm/overview/window_selector_item.cc
+++ b/ash/wm/overview/window_selector_item.cc
@@ -40,6 +40,7 @@
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/window/non_client_view.h"
+#include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow.h"
 #include "ui/wm/core/window_util.h"
 
@@ -106,8 +107,8 @@ static const float kPreCloseScale = 0.02f;
 // Note: The fade in animation will occur after a delay where the delay is how
 // long the lay out animations take.
 void SetupFadeInAfterLayout(views::Widget* widget) {
-  WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
-  window->SetOpacity(0.0f);
+  aura::Window* window = widget->GetNativeWindow();
+  window->layer()->SetOpacity(0.0f);
   std::unique_ptr<ScopedOverviewAnimationSettings>
       scoped_overview_animation_settings =
           ScopedOverviewAnimationSettingsFactory::Get()
@@ -115,7 +116,7 @@ void SetupFadeInAfterLayout(views::Widget* widget) {
                   OverviewAnimationType::
                       OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_IN,
                   window);
-  window->SetOpacity(1.0f);
+  window->layer()->SetOpacity(1.0f);
 }
 
 // A Button that has a listener and listens to mouse clicks on the visible part
@@ -177,7 +178,7 @@ class WindowSelectorItem::RoundedContainerView
       public ui::LayerAnimationObserver {
  public:
   RoundedContainerView(WindowSelectorItem* item,
-                       WmWindow* item_window,
+                       aura::Window* item_window,
                        int corner_radius,
                        SkColor background)
       : item_(item),
@@ -285,9 +286,9 @@ class WindowSelectorItem::RoundedContainerView
     // during the initial animation. Once the initial fade-in completes and the
     // overview header is fully exposed update stacking to keep the label above
     // the item which prevents input events from reaching the window.
-    WmWindow* widget_window = WmWindow::Get(GetWidget()->GetNativeWindow());
+    aura::Window* widget_window = GetWidget()->GetNativeWindow();
     if (widget_window && item_window_)
-      widget_window->GetParent()->StackChildAbove(widget_window, item_window_);
+      widget_window->parent()->StackChildAbove(widget_window, item_window_);
     item_window_ = nullptr;
   }
 
@@ -325,7 +326,7 @@ class WindowSelectorItem::RoundedContainerView
       ui::LayerAnimationSequence* sequence) override {}
 
   WindowSelectorItem* item_;
-  WmWindow* item_window_;
+  aura::Window* item_window_;
   int corner_radius_;
   SkColor initial_color_;
   SkColor target_color_;
@@ -401,7 +402,7 @@ class WindowSelectorItem::CaptionContainerView : public views::View {
   DISALLOW_COPY_AND_ASSIGN(CaptionContainerView);
 };
 
-WindowSelectorItem::WindowSelectorItem(WmWindow* window,
+WindowSelectorItem::WindowSelectorItem(aura::Window* window,
                                        WindowSelector* window_selector)
     : dimmed_(false),
       root_window_(window->GetRootWindow()),
@@ -413,15 +414,15 @@ WindowSelectorItem::WindowSelectorItem(WmWindow* window,
       close_button_(new OverviewCloseButton(this)),
       window_selector_(window_selector),
       background_view_(nullptr) {
-  CreateWindowLabel(window->aura_window()->GetTitle());
-  GetWindow()->aura_window()->AddObserver(this);
+  CreateWindowLabel(window->GetTitle());
+  GetWindow()->AddObserver(this);
 }
 
 WindowSelectorItem::~WindowSelectorItem() {
-  GetWindow()->aura_window()->RemoveObserver(this);
+  GetWindow()->RemoveObserver(this);
 }
 
-WmWindow* WindowSelectorItem::GetWindow() {
+aura::Window* WindowSelectorItem::GetWindow() {
   return transform_window_.window();
 }
 
@@ -448,15 +449,15 @@ void WindowSelectorItem::Shutdown() {
     // overview) results in stacking it at the top. Maintain the label window
     // stacking position above the item to make the header transformation more
     // gradual upon exiting the overview mode.
-    WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
+    aura::Window* widget_window = item_widget_->GetNativeWindow();
 
     // |widget_window| was originally created in the same container as the
     // |transform_window_| but when closing overview the |transform_window_|
     // could have been reparented if a drag was active. Only change stacking
     // if the windows still belong to the same container.
-    if (widget_window->GetParent() == transform_window_.window()->GetParent()) {
-      widget_window->GetParent()->StackChildAbove(widget_window,
-                                                  transform_window_.window());
+    if (widget_window->parent() == transform_window_.window()->parent()) {
+      widget_window->parent()->StackChildAbove(widget_window,
+                                               transform_window_.window());
     }
   }
   if (background_view_) {
@@ -472,7 +473,7 @@ void WindowSelectorItem::PrepareForOverview() {
                      OverviewAnimationType::OVERVIEW_ANIMATION_NONE);
 }
 
-bool WindowSelectorItem::Contains(const WmWindow* target) const {
+bool WindowSelectorItem::Contains(const aura::Window* target) const {
   return transform_window_.Contains(target);
 }
 
@@ -615,24 +616,23 @@ void WindowSelectorItem::CreateWindowLabel(const base::string16& title) {
       views::Widget::InitParams::Activatable::ACTIVATABLE_DEFAULT;
   params_label.accept_events = true;
   item_widget_.reset(new views::Widget);
-  root_window_->GetRootWindowController()
+  RootWindowController::ForWindow(root_window_)
       ->ConfigureWidgetInitParamsForContainer(
-          item_widget_.get(),
-          transform_window_.window()->GetParent()->aura_window()->id(),
+          item_widget_.get(), transform_window_.window()->parent()->id(),
           &params_label);
   item_widget_->set_focus_on_creation(false);
   item_widget_->Init(params_label);
-  WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
+  aura::Window* widget_window = item_widget_->GetNativeWindow();
   if (transform_window_.GetTopInset()) {
     // For windows with headers the overview header fades in above the
     // original window header.
-    widget_window->GetParent()->StackChildAbove(widget_window,
-                                                transform_window_.window());
+    widget_window->parent()->StackChildAbove(widget_window,
+                                             transform_window_.window());
   } else {
     // For tabbed windows the overview header slides from behind. The stacking
     // is then corrected when the animation completes.
-    widget_window->GetParent()->StackChildBelow(widget_window,
-                                                transform_window_.window());
+    widget_window->parent()->StackChildBelow(widget_window,
+                                             transform_window_.window());
   }
   label_view_ = new views::Label(title);
   label_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -655,8 +655,8 @@ void WindowSelectorItem::CreateWindowLabel(const base::string16& title) {
 void WindowSelectorItem::UpdateHeaderLayout(
     HeaderFadeInMode mode,
     OverviewAnimationType animation_type) {
-  gfx::Rect transformed_window_bounds = root_window_->ConvertRectFromScreen(
-      transform_window_.GetTransformedBounds());
+  gfx::Rect transformed_window_bounds(transform_window_.GetTransformedBounds());
+  ::wm::ConvertRectFromScreen(root_window_, &transformed_window_bounds);
 
   gfx::Rect label_rect(close_button_->GetPreferredSize());
   label_rect.set_width(transformed_window_bounds.width());
@@ -687,7 +687,7 @@ void WindowSelectorItem::UpdateHeaderLayout(
     label_view_->SetVisible(true);
     SetupFadeInAfterLayout(item_widget_.get());
   }
-  WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
+  aura::Window* widget_window = item_widget_->GetNativeWindow();
   std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
       ScopedOverviewAnimationSettingsFactory::Get()
           ->CreateOverviewAnimationSettings(animation_type, widget_window);
@@ -715,23 +715,23 @@ void WindowSelectorItem::AnimateOpacity(float opacity,
   transform_window_.SetOpacity(opacity);
 
   const float header_opacity = selected_ ? 0.f : kHeaderOpacity * opacity;
-  WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
+  aura::Window* widget_window = item_widget_->GetNativeWindow();
   std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
       ScopedOverviewAnimationSettingsFactory::Get()
           ->CreateOverviewAnimationSettings(animation_type, widget_window);
-  widget_window->SetOpacity(header_opacity);
+  widget_window->layer()->SetOpacity(header_opacity);
 }
 
 void WindowSelectorItem::UpdateAccessibilityName() {
   caption_container_view_->listener_button()->SetAccessibleName(
-      GetWindow()->aura_window()->GetTitle());
+      GetWindow()->GetTitle());
 }
 
 void WindowSelectorItem::FadeOut(std::unique_ptr<views::Widget> widget) {
   widget->SetOpacity(1.f);
 
   // Fade out the widget. This animation continues past the lifetime of |this|.
-  WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow());
+  aura::Window* widget_window = widget->GetNativeWindow();
   std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
       ScopedOverviewAnimationSettingsFactory::Get()
           ->CreateOverviewAnimationSettings(
@@ -756,7 +756,7 @@ gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() {
   return background_view_ ? background_view_->animation() : nullptr;
 }
 
-WmWindow* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() {
+aura::Window* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() {
   return transform_window_.GetOverviewWindowForMinimizedState();
 }