Moves common code in ash/wm/overview to ash/common/wm/overview

ash/common/wm/overview/window_selector.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 "ash/wm/overview/window_selector.h"
+#include "ash/common/wm/overview/window_selector.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_grid.h"
+#include "ash/common/wm/overview/window_selector_delegate.h"
+#include "ash/common/wm/overview/window_selector_item.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/switchable_windows.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/wm/overview/window_grid.h"
-#include "ash/wm/overview/window_selector_delegate.h"
-#include "ash/wm/overview/window_selector_item.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
@@ skipping 89 matching lines @@
   const WmWindow* root_window;
 };
 
 // A View having rounded corners and a specified background color which is
 // only painted within the bounds defined by the rounded corners.
 // TODO(tdanderson): This duplicates code from RoundedImageView. Refactor these
 //                   classes and move into ui/views.
 class RoundedContainerView : public views::View {
  public:
   RoundedContainerView(int corner_radius, SkColor background)
-      : corner_radius_(corner_radius),
-        background_(background) {
-  }
+      : corner_radius_(corner_radius), background_(background) {}
 
   ~RoundedContainerView() override {}
 
   void OnPaint(gfx::Canvas* canvas) override {
     views::View::OnPaint(canvas);
 
     SkScalar radius = SkIntToScalar(corner_radius_);
     const SkScalar kRadius[8] = {radius, radius, radius, radius,
                                  radius, radius, radius, radius};
     SkPath path;
@@ skipping 252 matching lines @@
 
   // Record metrics related to text filtering.
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.TextFilteringStringLength",
                            text_filter_string_length_);
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.TextFilteringTextfieldCleared",
                            num_times_textfield_cleared_);
   if (text_filter_string_length_) {
     UMA_HISTOGRAM_MEDIUM_TIMES(
         "Ash.WindowSelector.TimeInOverviewWithTextFiltering",
         base::Time::Now() - overview_start_time_);
-    UMA_HISTOGRAM_COUNTS_100(
-        "Ash.WindowSelector.ItemsWhenTextFilteringUsed",
-        remaining_items);
+    UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.ItemsWhenTextFilteringUsed",
+                             remaining_items);
   }
 
   // Clearing the window list resets the ignored_by_shelf flag on the windows.
   grid_list_.clear();
   UpdateShelfVisibility();
 }
 
 void WindowSelector::RemoveAllObservers() {
   for (WmWindow* window : observed_windows_)
     window->RemoveObserver(this);
@@ skipping 67 matching lines @@
     case ui::VKEY_LEFT:
       num_key_presses_++;
       Move(WindowSelector::LEFT, true);
       break;
     case ui::VKEY_RETURN:
       // Ignore if no item is selected.
       if (!grid_list_[selected_grid_index_]->is_selecting())
         return false;
       UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.ArrowKeyPresses",
                                num_key_presses_);
-      UMA_HISTOGRAM_CUSTOM_COUNTS(
-          "Ash.WindowSelector.KeyPressesOverItemsRatio",
-          (num_key_presses_ * 100) / num_items_, 1, 300, 30);
+      UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.WindowSelector.KeyPressesOverItemsRatio",
+                                  (num_key_presses_ * 100) / num_items_, 1, 300,
+                                  30);
       WmShell::Get()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW_ENTER_KEY);
       SelectWindow(
           grid_list_[selected_grid_index_]->SelectedWindow()->GetWindow());
       break;
     default:
       // Not a key we are interested in, allow the textfield to handle it.
       return false;
   }
   return true;
 }
@@ skipping 77 matching lines @@
   if (!text_filter_string_length_)
     num_times_textfield_cleared_++;
 
   bool should_show_selection_widget = !new_contents.empty();
   if (showing_selection_widget_ != should_show_selection_widget) {
     WmWindow* text_filter_widget_window = GetTextFilterWidgetWindow();
     ui::ScopedLayerAnimationSettings animation_settings(
         text_filter_widget_window->GetLayer()->GetAnimator());
     animation_settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-    animation_settings.SetTweenType(showing_selection_widget_ ?
-        gfx::Tween::FAST_OUT_LINEAR_IN : gfx::Tween::LINEAR_OUT_SLOW_IN);
+    animation_settings.SetTweenType(showing_selection_widget_
+                                        ? gfx::Tween::FAST_OUT_LINEAR_IN
+                                        : gfx::Tween::LINEAR_OUT_SLOW_IN);
 
     gfx::Transform transform;
     if (should_show_selection_widget) {
       transform.Translate(0, 0);
       text_filter_widget_window->SetOpacity(1);
     } else {
       transform.Translate(0, -text_filter_bottom_);
       text_filter_widget_window->SetOpacity(0);
     }
 
@@ skipping 34 matching lines @@
 void WindowSelector::ResetFocusRestoreWindow(bool focus) {
   if (!restore_focus_window_)
     return;
   if (focus) {
     base::AutoReset<bool> restoring_focus(&ignore_activations_, true);
     restore_focus_window_->Activate();
   }
   // If the window is in the observed_windows_ list it needs to continue to be
   // observed.
   if (observed_windows_.find(restore_focus_window_) ==
-          observed_windows_.end()) {
+      observed_windows_.end()) {
     restore_focus_window_->RemoveObserver(this);
   }
   restore_focus_window_ = nullptr;
 }
 
 void WindowSelector::Move(Direction direction, bool animate) {
   // Direction to move if moving past the end of a display.
   int display_direction = (direction == RIGHT || direction == DOWN) ? 1 : -1;
 
   // If this is the first move and it's going backwards, start on the last
   // display.
   if (display_direction == -1 && !grid_list_.empty() &&
       !grid_list_[selected_grid_index_]->is_selecting()) {
     selected_grid_index_ = grid_list_.size() - 1;
   }
 
   // Keep calling Move() on the grids until one of them reports no overflow or
   // we made a full cycle on all the grids.
-  for (size_t i = 0;
-      i <= grid_list_.size() &&
-      grid_list_[selected_grid_index_]->Move(direction, animate); i++) {
+  for (size_t i = 0; i <= grid_list_.size() &&
+                     grid_list_[selected_grid_index_]->Move(direction, animate);
+       i++) {
     selected_grid_index_ =
         (selected_grid_index_ + display_direction + grid_list_.size()) %
         grid_list_.size();
   }
 }
 
 }  // namespace ash