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

Unified Diff: ui/events/gesture_detection/velocity_tracker_unittest.cc

Issue 401863003: Merge 279991 "[Android] Select text when stylus first button is ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985_122/src/
Patch Set: Created 6 years, 5 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
Index: ui/events/gesture_detection/velocity_tracker_unittest.cc
===================================================================
--- ui/events/gesture_detection/velocity_tracker_unittest.cc (revision 284124)
+++ ui/events/gesture_detection/velocity_tracker_unittest.cc (working copy)
@@ -7,13 +7,14 @@
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/events/gesture_detection/mock_motion_event.h"
#include "ui/events/gesture_detection/velocity_tracker_state.h"
+#include "ui/events/test/mock_motion_event.h"
#include "ui/gfx/geometry/point_f.h"
#include "ui/gfx/geometry/vector2d_f.h"
using base::TimeDelta;
using base::TimeTicks;
+using ui::test::MockMotionEvent;
namespace ui {
namespace {
« no previous file with comments | « ui/events/gesture_detection/touch_disposition_gesture_filter_unittest.cc ('k') | ui/events/test/mock_motion_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698