Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2750)

Unified Diff: ash/wm/system_gesture_event_filter.cc

Issue 2833093002: WIP: simplified display management in ash (Closed)
Patch Set: x Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index 9dcfd924b49bb8fc93a4952b22d05dd228852acb..962ad2bf500e61243166e69efca8f346046e5366 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -5,6 +5,7 @@
#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"
@@ -20,7 +21,10 @@ SystemGestureEventFilter::SystemGestureEventFilter()
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);
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698