Visual improvements to text filtering in Ash overview mode

ash/wm/overview/window_selector_unittest.cc

 // 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.
 
 #include <algorithm>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 867 matching lines @@
   EXPECT_EQ(GetSelectedWindow(), window2.get());
   SendKey(ui::VKEY_TAB);
   EXPECT_EQ(GetSelectedWindow(), window1.get());
 }
 
 // Tests traversing some windows in overview mode with the arrow keys in every
 // possible direction.
 TEST_F(WindowSelectorTest, BasicArrowKeyNavigation) {
   if (!SupportsHostWindowResize())
     return;
-  const size_t test_windows = 7;
-  UpdateDisplay("400x300");
+  const size_t test_windows = 9;
+  UpdateDisplay("800x600");
   ScopedVector<aura::Window> windows;
   for (size_t i = test_windows; i > 0; i--)
     windows.push_back(CreateWindowWithId(gfx::Rect(0, 0, 100, 100), i));
 
   ui::KeyboardCode arrow_keys[] = {
       ui::VKEY_RIGHT,
       ui::VKEY_DOWN,
       ui::VKEY_LEFT,
       ui::VKEY_UP
   };
-  // Expected window layout:
-  // +-------+  +-------+  +-------+
-  // |   1   |  |   2   |  |   3   |
-  // +-------+  +-------+  +-------+
-  // +-------+  +-------+  +-------+
-  // |   4   |  |   5   |  |   6   |
-  // +-------+  +-------+  +-------+
+  // Expected window layout, assuming that the text filtering feature is
+  // enabled by default (i.e., --ash-disable-text-filtering-in-overview-mode
+  // is not being used).
+  // +-------+  +-------+  +-------+  +-------+
+  // |   1   |  |   2   |  |   3   |  |   4   |
+  // +-------+  +-------+  +-------+  +-------+
+  // +-------+  +-------+  +-------+  +-------+
+  // |   5   |  |   6   |  |   7   |  |   8   |
+  // +-------+  +-------+  +-------+  +-------+
   // +-------+
-  // |   7   |
+  // |   9   |
   // +-------+
   // Index for each window during a full loop plus wrapping around.
   int index_path_for_direction[][test_windows + 1] = {
-      {1, 2, 3, 4, 5, 6, 7, 1},  // Right
-      {1, 4, 7, 2, 5, 3, 6, 1},  // Down
-      {7, 6, 5, 4, 3, 2, 1, 7},  // Left
-      {6, 3, 5, 2, 7, 4, 1, 6}   // Up
+      {1, 2, 3, 4, 5, 6, 7, 8, 9, 1},  // Right
+      {1, 5, 9, 2, 6, 3, 7, 4, 8, 1},  // Down
+      {9, 8, 7, 6, 5, 4, 3, 2, 1, 9},  // Left
+      {8, 4, 7, 3, 6, 2, 9, 5, 1, 8}   // Up
   };
 
   for (size_t key_index = 0; key_index < arraysize(arrow_keys); key_index++) {
     ToggleOverview();
     for (size_t i = 0; i < test_windows + 1; i++) {
       SendKey(arrow_keys[key_index]);
       // TODO(flackr): Add a more readable error message by constructing a
       // string from the window IDs.
       EXPECT_EQ(GetSelectedWindow()->id(),
                 index_path_for_direction[key_index][i]);
@@ skipping 204 matching lines @@
    // Dimming all the items should hide the selection widget.
    FilterItems("Pop");
    EXPECT_FALSE(selection_widget_active());
 
    // Undimming one window should automatically select it.
    FilterItems("Rock and roll");
    EXPECT_EQ(GetSelectedWindow(), window2.get());
 }
 
 }  // namespace ash