WIP: simplified display management in ash

ash/wm/system_gesture_event_filter.cc

 // Copyright (c) 2012 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/system_gesture_event_filter.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
+#include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
 #include "ash/wm/gestures/overview_gesture_handler.h"
 #include "ui/base/touch/touch_device.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
 namespace ash {
 
 SystemGestureEventFilter::SystemGestureEventFilter()
     : overview_gesture_handler_(new OverviewGestureHandler) {}
 
 SystemGestureEventFilter::~SystemGestureEventFilter() {}
 
 void SystemGestureEventFilter::OnMouseEvent(ui::MouseEvent* event) {
+  // ui::GetTouchScreensAvailability() uses InputDeviceManager, which is
+  // not created in mash. Figure out!
   if (event->type() == ui::ET_MOUSE_PRESSED &&
+      Shell::GetAshConfig() == Config::CLASSIC &&
       ui::GetTouchScreensAvailability() ==
           ui::TouchScreensAvailability::ENABLED) {
     Shell::Get()->metrics()->RecordUserMetricsAction(UMA_MOUSE_DOWN);
   }
 }
 
 void SystemGestureEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
   if (overview_gesture_handler_ &&
       overview_gesture_handler_->ProcessScrollEvent(*event)) {
     event->StopPropagation();
   }
 }
 
 void SystemGestureEventFilter::OnTouchEvent(ui::TouchEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   ash::TouchUMA::GetInstance()->RecordTouchEvent(target, *event);
 }
 
 void SystemGestureEventFilter::OnGestureEvent(ui::GestureEvent* event) {
   aura::Window* target = static_cast<aura::Window*>(event->target());
   ash::TouchUMA::GetInstance()->RecordGestureEvent(target, *event);
 }
 
 }  // namespace ash