Added text filtering to Overview Mode

ash/wm/overview/window_grid.cc

 // Copyright 2014 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 "ash/wm/overview/window_grid.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
 #include "ash/wm/overview/window_selector.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/overview/window_selector_panels.h"
 #include "ash/wm/overview/window_selector_window.h"
 #include "ash/wm/window_state.h"
 #include "base/memory/scoped_vector.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "third_party/icu/source/i18n/unicode/translit.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/views/background.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_animations.h"
@@ skipping 94 matching lines @@
   }
   return vector;
 }
 
 }  // namespace
 
 WindowGrid::WindowGrid(aura::Window* root_window,
                        const std::vector<aura::Window*>& windows,
                        WindowSelector* window_selector)
     : root_window_(root_window),
-      window_selector_(window_selector) {
+      window_selector_(window_selector),
+      item_active_(true) {
   WindowSelectorPanels* panels_item = NULL;
   for (aura::Window::Windows::const_iterator iter = windows.begin();
        iter != windows.end(); ++iter) {
     if ((*iter)->GetRootWindow() != root_window)
       continue;
     (*iter)->AddObserver(this);
     observed_windows_.insert(*iter);
     WindowSelectorItem* item = NULL;
 
     if ((*iter)->type() == ui::wm::WINDOW_TYPE_PANEL &&
@@ skipping 48 matching lines @@
       static_cast<int>(total_bounds.width() / num_columns_),
       static_cast<int>(total_bounds.height() * kCardAspectRatio / num_rows)));
   window_size.set_height(window_size.width() / kCardAspectRatio);
 
   // Calculate the X and Y offsets necessary to center the grid.
   int x_offset = total_bounds.x() + ((window_list_.size() >= num_columns_ ? 0 :
       (num_columns_ - window_list_.size()) * window_size.width()) +
       (total_bounds.width() - num_columns_ * window_size.width())) / 2;
   int y_offset = total_bounds.y() + (total_bounds.height() -
       num_rows * window_size.height()) / 2;
+
   for (size_t i = 0; i < window_list_.size(); ++i) {
     gfx::Transform transform;
     int column = i % num_columns_;
     int row = i / num_columns_;
     gfx::Rect target_bounds(window_size.width() * column + x_offset,
                             window_size.height() * row + y_offset,
                             window_size.width(),
                             window_size.height());
     window_list_[i]->SetBounds(root_window_, target_bounds, animate);
   }
 
   // If we have less than |kMinCardsMajor| windows, adjust the column_ value to
   // reflect how many "real" columns we have.
   if (num_columns_ > window_list_.size())
     num_columns_ = window_list_.size();
 
   // If the selection widget is active, reposition it without any animation.
   if (selection_widget_)
     MoveSelectionWidgetToTarget(animate);
 }
 
 bool WindowGrid::Move(WindowSelector::Direction direction) {
+  if (!item_active_)
+    return false;
+
   bool recreate_selection_widget = false;
   bool out_of_bounds = false;
   if (!selection_widget_) {
     switch (direction) {
      case WindowSelector::LEFT:
        selected_index_ = window_list_.size() - 1;
        break;
      case WindowSelector::UP:
        selected_index_ =
            (window_list_.size() / num_columns_) * num_columns_ - 1;
        break;
      case WindowSelector::RIGHT:
      case WindowSelector::DOWN:
        selected_index_ = 0;
        break;
      }
-  } else {
+  }
+  while (!SelectedWindow()->active() || selection_widget_) {
     switch (direction) {
       case WindowSelector::RIGHT:
         if (selected_index_ >= window_list_.size() - 1)
           out_of_bounds = true;
         selected_index_++;
         if (selected_index_ % num_columns_ == 0)
           recreate_selection_widget = true;
         break;
       case WindowSelector::LEFT:
         if (selected_index_ == 0)
@@ skipping 16 matching lines @@
           out_of_bounds = true;
         if (selected_index_ < num_columns_) {
           selected_index_ += num_columns_ *
               ((window_list_.size() - selected_index_) / num_columns_) - 1;
           recreate_selection_widget = true;
         } else {
           selected_index_ -= num_columns_;
         }
         break;
     }
+    // Exit the loop if we broke free from the grid or found an active item.
+    if (out_of_bounds || SelectedWindow()->active())
+      break;
   }
 
   MoveSelectionWidget(direction, recreate_selection_widget, out_of_bounds);
   return out_of_bounds;
 }
 
 WindowSelectorItem* WindowGrid::SelectedWindow() const {
   CHECK(selected_index_ < window_list_.size());
   return window_list_[selected_index_];
 }
 
 bool WindowGrid::Contains(const aura::Window* window) const {
   return std::find_if(window_list_.begin(), window_list_.end(),
                       WindowSelectorItemTargetComparator(window)) !=
                           window_list_.end();
 }
 
+void WindowGrid::Filter(const base::string16& pattern) {
+  item_active_ = false;
+  UErrorCode status = U_ZERO_ERROR;
+
+  // Construct a transilterator that removes accents and converts uppercase
+  // letters to lowercase in a l10n sensitive context.

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

I would instead mention the fact that your filtering is accent- and
case-insensitive in the method documentation for Filter() (in the header).

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

Done.

+  icu::Transliterator* translit = icu::Transliterator::createInstance(
+      "Lower (Upper); NFD; [:Nonspacing Mark:] Remove; NFC",
+      UTRANS_FORWARD, status);
+  icu::UnicodeString target(pattern.c_str());
+  translit->transliterate(target);
+
+  for (ScopedVector<WindowSelectorItem>::iterator iter = window_list_.begin();
+       iter != window_list_.end(); iter++) {
+    icu::UnicodeString title_string(
+        (*iter)->SelectionWindow()->title().c_str());
+    translit->transliterate(title_string);
+    const base::string16& title(title_string.getTerminatedBuffer());
+    if (title.find(target.getTerminatedBuffer()) != base::string16::npos) {
+      (*iter)->SetActive(true);
+      item_active_ = true;
+    } else {
+      (*iter)->SetActive(false);
+      if (selection_widget_ && SelectedWindow() == *iter)
+        selection_widget_.reset();
+    }
+  }
+  // If the selection widget is not active, execute a Move() command so that it
+  // shows up.

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

"shows up on the first unfiltered item"?

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

Done.

+  if (!selection_widget_)
+    Move(WindowSelector::RIGHT);
+}
+
 void WindowGrid::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
   observed_windows_.erase(window);
   ScopedVector<WindowSelectorItem>::iterator iter =
       std::find_if(window_list_.begin(), window_list_.end(),
                    WindowSelectorItemComparator(window));
 
   DCHECK(iter != window_list_.end());
 
   (*iter)->RemoveWindow(window);
@@ skipping 132 matching lines @@
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     selection_widget_->SetBounds(SelectedWindow()->target_bounds());
     selection_widget_->SetOpacity(kWindowOverviewSelectorOpacity);
     return;
   }
   selection_widget_->SetBounds(SelectedWindow()->target_bounds());
   selection_widget_->SetOpacity(kWindowOverviewSelectorOpacity);
 }
 
 }  // namespace ash