Separated alt-tab window cycle from 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 <set>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "ui/aura/window_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 class RootWindow;
 }
 
-namespace ui {
-class EventHandler;
-}
-
 namespace ash {
 class ScopedShowWindow;

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

Remove this.

 class WindowOverview;
 class WindowSelectorDelegate;
 class WindowSelectorItem;
 class WindowSelectorTest;
 
 // The WindowSelector allows selecting a window by alt-tabbing (CYCLE mode) or
 // by clicking or tapping on it (OVERVIEW mode). A WindowOverview will be shown
 // in OVERVIEW mode or if the user lingers on a window while alt tabbing.
 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.

 
   // Choose |window| from the available windows to select.
   void SelectWindow(aura::Window* window);
 
   // 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,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // Overridden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE;
@@ skipping 11 matching lines @@
   // |focus|, restores focus to the stored window.
   void ResetFocusRestoreWindow(bool focus);
 
   // The collection of items in the overview wrapped by a helper class which
   // restores their state and helps transform them to other root windows.
   ScopedVector<WindowSelectorItem> windows_;
 
   // 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_;
 
   // Index of the currently selected window if the mode is CYCLE.
   size_t selected_window_;

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

I'd probably remove this for now.

 
   // 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.
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_