Move even more from WmShell to Shell

ash/common/metrics/pointer_metrics_recorder.cc

 // Copyright 2016 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/common/metrics/pointer_metrics_recorder.h"
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/shared/app_types.h"
+#include "ash/shell.h"
 #include "base/metrics/histogram_macros.h"
 #include "ui/events/event_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 // Form factor of the down event. This enum is used to back an UMA histogram
 // and new values should be inserted immediately above FORM_FACTOR_COUNT.
@@ skipping 17 matching lines @@
   if (!target)
     return static_cast<int>(AppType::OTHERS);
 
   WmWindow* window = WmWindow::Get(target->GetNativeWindow());
   DCHECK(window);
   return window->GetAppType();
 }
 
 void RecordUMA(ui::EventPointerType type, views::Widget* target) {
   DownEventFormFactor form_factor = DownEventFormFactor::CLAMSHELL;
-  if (ash::WmShell::Get()
+  if (Shell::Get()
           ->maximize_mode_controller()
           ->IsMaximizeModeWindowManagerEnabled()) {
     form_factor = DownEventFormFactor::TOUCH_VIEW;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Event.DownEventCount.PerFormFactor",
       static_cast<base::HistogramBase::Sample>(form_factor),
       static_cast<base::HistogramBase::Sample>(
           DownEventFormFactor::FORM_FACTOR_COUNT));
 
@@ skipping 38 matching lines @@
 
 void PointerMetricsRecorder::OnPointerEventObserved(
     const ui::PointerEvent& event,
     const gfx::Point& location_in_screen,
     views::Widget* target) {
   if (event.type() == ui::ET_POINTER_DOWN)
     RecordUMA(event.pointer_details().pointer_type, target);
 }
 
 }  // namespace ash