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

ash/wm/overview/window_selector.h

 // 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.
 
 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/aura/window_observer.h"
 #include "ui/display/display_observer.h"
 #include "ui/gfx/image/image_skia.h"
 #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;
 }
 
 namespace ash {
 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.
 class ASH_EXPORT WindowSelector : public display::DisplayObserver,
                                   public aura::WindowObserver,
                                   public aura::client::ActivationChangeObserver,
                                   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;
 
   // Initialize with the windows that can be selected.
   void Init(const WindowList& windows);
 
   // Perform cleanup that cannot be done in the destructor.
   void Shutdown();
 
@@ skipping 46 matching lines @@
 
   // views::TextfieldController:
   void ContentsChanged(views::Textfield* sender,
                        const base::string16& new_contents) override;
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
 
  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);
 
   // Repositions and resizes |text_filter_widget_| on
   // DisplayMetricsChanged event.
   void RepositionTextFilterOnDisplayMetricsChange();
 
   // |focus|, restores focus to the stored window.
   void ResetFocusRestoreWindow(bool focus);
 
   // Helper function that moves the selection widget to |direction| on the
   // corresponding window grid.
   void Move(Direction direction, bool animate);
 
   // Removes all observers that were registered during construction and/or
   // initialization.
   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.
   WindowSelectorDelegate* delegate_;
 
   // 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.
   bool ignore_activations_;
 
   // List of all the window overview grids, one for each root window.
   std::vector<std::unique_ptr<WindowGrid>> grid_list_;
 
   // Tracks the index of the root window the selection widget is in.
   size_t selected_grid_index_;
@@ skipping 36 matching lines @@
   int text_filter_bottom_;
 
   bool is_shut_down_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_