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

Unified Diff: ui/events/gestures/motion_event_aura.cc

Issue 613373004: Adopt ui::GestureConfiguration on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Copyright Created 6 years, 2 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 | « ui/events/gestures/gesture_recognizer_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gestures/motion_event_aura.cc
diff --git a/ui/events/gestures/motion_event_aura.cc b/ui/events/gestures/motion_event_aura.cc
index 1b7b825e7f1fa60e47efeca5d630a247ed037604..e7d2ad2a334c94ca1c96d6eb0ee681e75a29d744 100644
--- a/ui/events/gestures/motion_event_aura.cc
+++ b/ui/events/gestures/motion_event_aura.cc
@@ -10,7 +10,7 @@
#include <cmath>
#include "base/logging.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
namespace ui {
@@ -70,8 +70,10 @@ MotionEventAura::PointData MotionEventAura::GetPointDataFromTouchEvent(
}
if (!point_data.touch_major) {
- point_data.touch_major = 2.f * GestureConfiguration::default_radius();
- point_data.touch_minor = 2.f * GestureConfiguration::default_radius();
+ point_data.touch_major =
+ 2.f * GestureConfiguration::GetInstance()->default_radius();
+ point_data.touch_minor =
+ 2.f * GestureConfiguration::GetInstance()->default_radius();
point_data.orientation = 0;
}
« no previous file with comments | « ui/events/gestures/gesture_recognizer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698