Separated alt-tab window cycle from 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 2139a17329afa2d38c0d439e91065cfcaf28d4ce..c37780c8a5b370188e1106e5393e227bcee6dd7a 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -20,10 +20,6 @@ namespace aura {
 class RootWindow;
 }
 
-namespace ui {
-class EventHandler;
-}
-
 namespace ash {
 class ScopedShowWindow;

[flackr, 2014/05/06 02:21:37]

Remove this.

 class WindowOverview;
@@ -38,25 +34,12 @@ class ASH_EXPORT WindowSelector
     : public aura::WindowObserver,
       public aura::client::ActivationChangeObserver {
  public:
-  enum Direction {
-    FORWARD,
-    BACKWARD
-  };
-  enum Mode {
-    CYCLE,
-    OVERVIEW
-  };
-
   typedef std::vector<aura::Window*> WindowList;
 
   WindowSelector(const WindowList& windows,
-                 Mode mode,
                  WindowSelectorDelegate* delegate);
   virtual ~WindowSelector();
 
-  // Step to the next window in |direction|.
-  void Step(Direction direction);
-
   // Choose the currently selected window.
   void SelectWindow();

[flackr, 2014/05/06 02:21:37]

No such thing as "selected" window at present.

[Nina, 2014/05/06 12:46:04]

Done.

 
@@ -66,8 +49,6 @@ class ASH_EXPORT WindowSelector
   // Cancels window selection.
   void CancelSelection();
 
-  Mode mode() { return mode_; }
-
   // aura::WindowObserver:
   virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
   virtual void OnWindowBoundsChanged(aura::Window* window,
@@ -99,22 +80,8 @@ class ASH_EXPORT WindowSelector
   // Tracks observed windows.
   std::set<aura::Window*> observed_windows_;
 
-  // The window selection mode.
-  Mode mode_;
-
-  // An event handler listening for the release of the alt key during alt-tab
-  // cycling.
-  scoped_ptr<ui::EventHandler> event_handler_;
-
-  // The currently selected window being shown (temporarily brought to the front
-  // of the stacking order and made visible).
-  scoped_ptr<ScopedShowWindow> showing_window_;
-
   scoped_ptr<WindowOverview> window_overview_;
 
-  // The time when window cycling was started.
-  base::Time cycle_start_time_;
-
   // Weak pointer to the selector delegate which will be called when a
   // selection is made.
   WindowSelectorDelegate* delegate_;