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

ash/wm/overview/window_selector.h

Index: ash/wm/overview/window_selector.h
diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h
index fea54f200fb31d6a2f7675c4c7cbcbe138bf7505..1dcd9b6c1662507392f48fff0418d72f6fa12271 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -21,6 +21,10 @@
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/wm/public/activation_change_observer.h"
 
+namespace aura {
+class Window;

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

nit: not needed (window_observer.h)

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

Done.

+}
+
 namespace views {
 class Textfield;
 class Widget;
@@ -31,7 +35,6 @@ class WindowSelectorDelegate;
 class WindowSelectorItem;
 class WindowSelectorTest;
 class WindowGrid;
-class WmWindow;
 
 // The WindowSelector shows a grid of all of your windows, allowing to select
 // one by clicking or tapping on it.
@@ -41,11 +44,11 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
                                   public views::TextfieldController {
  public:
   // Returns true if the window can be selected in overview mode.
-  static bool IsSelectable(WmWindow* window);
+  static bool IsSelectable(aura::Window* window);
 
   enum Direction { LEFT, UP, RIGHT, DOWN };
 
-  using WindowList = std::vector<WmWindow*>;
+  using WindowList = std::vector<aura::Window*>;

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

ditto optional nit

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

Worth include aura/window.h?

 
   explicit WindowSelector(WindowSelectorDelegate* delegate);
   ~WindowSelector() override;
@@ -112,8 +115,8 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
  private:
   friend class WindowSelectorTest;
 
-  // Returns the WmWindow for |text_filter_widget_|.
-  WmWindow* GetTextFilterWidgetWindow();
+  // Returns the aura::Window for |text_filter_widget_|.
+  aura::Window* GetTextFilterWidgetWindow();
 
   // Position all of the windows in the overview.
   void PositionWindows(bool animate);
@@ -134,7 +137,7 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
   void RemoveAllObservers();
 
   // Tracks observed windows.
-  std::set<WmWindow*> observed_windows_;
+  std::set<aura::Window*> observed_windows_;
 
   // Weak pointer to the selector delegate which will be called when a
   // selection is made.
@@ -143,7 +146,7 @@ class ASH_EXPORT WindowSelector : public display::DisplayObserver,
   // A weak pointer to the window which was focused on beginning window
   // selection. If window selection is canceled the focus should be restored to
   // this window.
-  WmWindow* restore_focus_window_;
+  aura::Window* restore_focus_window_;
 
   // True when performing operations that may cause window activations. This is
   // used to prevent handling the resulting expected activation.