Added text filtering to 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/aura/window_tracker.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display_observer.h"
+#include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 class RootWindow;
 class Window;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class LocatedEvent;
 }
 
+namespace views {
+class Textfield;
+class Widget;
+}
+
 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.
 class ASH_EXPORT WindowSelector
-    : public ui::EventHandler,
-      public gfx::DisplayObserver,
+    : public gfx::DisplayObserver,
       public aura::WindowObserver,
-      public aura::client::ActivationChangeObserver {
+      public aura::client::ActivationChangeObserver,
+      public views::TextfieldController {
  public:
   enum Direction {
     LEFT,
     UP,
     RIGHT,
     DOWN
   };
 
   typedef std::vector<aura::Window*> WindowList;
   typedef ScopedVector<WindowSelectorItem> WindowSelectorItemList;
 
   WindowSelector(const WindowList& windows,
                  WindowSelectorDelegate* delegate);
   virtual ~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;
-
   // gfx::DisplayObserver:
   virtual void OnDisplayAdded(const gfx::Display& display) OVERRIDE;
   virtual void OnDisplayRemoved(const gfx::Display& display) OVERRIDE;
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
                                        uint32_t metrics) OVERRIDE;
 
   // aura::WindowObserver:
   virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE;
   virtual void OnAttemptToReactivateWindow(
       aura::Window* request_active,
       aura::Window* actual_active) OVERRIDE;
 
+  // views::TextfieldController:
+  virtual void ContentsChanged(views::Textfield* sender,
+                               const base::string16& new_contents) OVERRIDE;
+

[tdanderson, 2014/06/25 15:48:23]

Remove blank line

[Nina, 2014/06/26 15:20:18]

Done.

+  virtual bool HandleKeyEvent(views::Textfield* sender,
+                              const ui::KeyEvent& key_event);

[tdanderson, 2014/06/25 15:48:23]

OVERRIDE

[Nina, 2014/06/26 15:20:18]

Done.

+
  private:
   friend class WindowSelectorTest;
 
   // Begins positioning windows such that all windows are visible on the screen.
   void StartOverview();
 
   // Position all of the windows in the overview.
   void PositionWindows(bool animate);
 
   // Hide and track all hidden windows not in the overview item list.
@@ skipping 36 matching lines @@
   // them refer to this particular overview session and are not cumulative:
   // The time when overview was started.
   base::Time overview_start_time_;
 
   // The number of arrow key presses.
   size_t num_key_presses_;
 
   // The number of items in the overview.
   size_t num_items_;
 
+  // Indicates if we are showing the selection widget.
+  bool showing_selection_widget_;
+
+  // Window text filter widget.

[tdanderson, 2014/06/25 15:48:23]

Explain in a bit more detail what this is / what it's used for (since we own
this member, it should be our responsibility to give this explanation).

[Nina, 2014/06/26 15:20:17]

Done.

+  scoped_ptr<views::Widget> text_filter_widget_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowSelector);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_