Added arrow key navigation to 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 158df2cf7ea2604ca31d8d3354c5573b23f5101e..d6c85195ca1e66a59954c189483fa87222f0e6f3 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/wm/overview/window_selector.h
@@ -36,6 +36,7 @@ namespace ash {
 class WindowSelectorDelegate;
 class WindowSelectorItem;
 class WindowSelectorTest;
+class WindowGrid;
 
 // The WindowSelector shows a grid of all of your windows, allowing to select
 // one by clicking or tapping on it.
@@ -45,6 +46,13 @@ class ASH_EXPORT WindowSelector
       public aura::WindowObserver,
       public aura::client::ActivationChangeObserver {
  public:
+  enum Direction {
+    LEFT,
+    UP,
+    RIGHT,
+    DOWN
+  };
+
   typedef std::vector<aura::Window*> WindowList;
   typedef ScopedVector<WindowSelectorItem> WindowSelectorItemList;
 
@@ -55,6 +63,9 @@ class ASH_EXPORT WindowSelector
   // Cancels window selection.
   void CancelSelection();
 
+  // Called when the last window selector item from a grid is deleted.
+  void OnGridEmpty(WindowGrid* grid);
+
   // ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
 
@@ -66,9 +77,6 @@ class ASH_EXPORT WindowSelector
 
   // 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;
 
   // aura::client::ActivationChangeObserver:
@@ -84,25 +92,18 @@ class ASH_EXPORT WindowSelector
   // Begins positioning windows such that all windows are visible on the screen.
   void StartOverview();
 
-  // Returns true if a window is contained in the overview, and therefore should
-  // not be hidden prior to entering overview mode.
-  bool Contains(const aura::Window* window);
-
-  // Position all of the windows based on the current selection mode.
+  // Position all of the windows in the overview.
   void PositionWindows(bool animate);
-  // Position all of the windows from |root_window| on |root_window|.
-  void PositionWindowsFromRoot(aura::Window* root_window, bool animate);
 
-  // Resets the stored window from RemoveFocusAndSetRestoreWindow to NULL. If
-  // Hide and track all hidden windows not in overview.
+  // Hide and track all hidden windows not in the overview item list.
   void HideAndTrackNonOverviewWindows();
 
   // |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_;
+  // Helper function that moves the selection widget to |direction| on the
+  // corresponding window grid.
+  void Move(Direction direction);
 
   // Tracks observed windows.
   std::set<aura::Window*> observed_windows_;
@@ -120,6 +121,9 @@ class ASH_EXPORT WindowSelector
   // used to prevent handling the resulting expected activation.
   bool ignore_activations_;
 
+  // List of all the window overview grids, one for each root window.
+  ScopedVector<WindowGrid> grid_list_;
+
   // The time when overview was started.
   base::Time overview_start_time_;
 
@@ -127,6 +131,9 @@ class ASH_EXPORT WindowSelector
   // overview.
   aura::WindowTracker hidden_windows_;
 
+  // Tracks the index of the root window the selection widget is in.
+  size_t selected_grid_index_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };