Moves WindowSelectorController onto WmShell

ash/wm/gestures/overview_gesture_handler.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/gestures/overview_gesture_handler.h"
 
 #include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
 namespace ash {
 namespace {
 
 // The threshold before engaging overview on a three finger swipe on the
 // touchpad.
@@ skipping 18 matching lines @@
   scroll_y_ += event.y_offset();
 
   // Horizontal swiping is ignored.
   if (std::fabs(scroll_x_) >= std::fabs(scroll_y_)) {
     scroll_x_ = scroll_y_ = 0;
     return false;
   }
 
   // Only allow swipe up to enter overview, down to exit. Ignore extra swiping
   // in the wrong direction.
-  Shell* shell = Shell::GetInstance();
-  if (shell->window_selector_controller()->IsSelecting()) {
+  WindowSelectorController* window_selector_controller =
+      WmShell::Get()->window_selector_controller();
+  if (window_selector_controller->IsSelecting()) {
     if (scroll_y_ < 0)
       scroll_x_ = scroll_y_ = 0;
     if (scroll_y_ < kSwipeThresholdPixels)
       return false;
   } else {
     if (scroll_y_ > 0)
       scroll_x_ = scroll_y_ = 0;
     if (scroll_y_ > -kSwipeThresholdPixels)
       return false;
   }
 
   // Reset scroll amount on toggling.
   scroll_x_ = scroll_y_ = 0;
-  shell->metrics()->RecordUserMetricsAction(UMA_TOUCHPAD_GESTURE_OVERVIEW);
-  shell->window_selector_controller()->ToggleOverview();
+  Shell::GetInstance()->metrics()->RecordUserMetricsAction(

[James Cook, 2016/06/22 22:46:19]

nit: This could become WmShell::Get()->RecordUserMetricsAction() and eliminate
#include shell.h and user_metrics_recorder.h

[sky, 2016/06/22 23:19:39]

Done.

+      UMA_TOUCHPAD_GESTURE_OVERVIEW);
+  window_selector_controller->ToggleOverview();
   return true;
 }
 
 }  // namespace ash