Fold |is_touch_handle_event| into MotionEventAndroid
Polished up the plumbing by removing the only extra parameter
passed along. This consolidates the overloaded methods
|OnTouchEvent| in RWHVA.
Change-Id: I9e3db0c4c02dbd8e696b681c4fad3f9fd543e9d8
Reviewed-on: https://chromium-review.googlesource.com/612033
Commit-Queue: Jinsuk Kim <[email protected]>
Reviewed-by: Pedro Amaral <[email protected]>
Reviewed-by: Alexandre Elias <[email protected]>
Reviewed-by: Bo <[email protected]>
Cr-Commit-Position: refs/heads/master@{#498352}diff --git a/ui/android/view_android_unittests.cc b/ui/android/view_android_unittests.cc
index f3d077a..2205668 100644
--- a/ui/android/view_android_unittests.cc
+++ b/ui/android/view_android_unittests.cc
@@ -20,8 +20,7 @@
TestViewClient() : handle_event_(true), called_(false) {}
void SetHandleEvent(bool handle_event) { handle_event_ = handle_event; }
- bool OnTouchEvent(const MotionEventAndroid& event,
- bool for_touch_handle) override {
+ bool OnTouchEvent(const MotionEventAndroid& event) override {
called_ = true;
return handle_event_;
}
@@ -56,9 +55,9 @@
ui::MotionEventAndroid::Pointer pointer0(0, x, y, 0, 0, 0, 0, 0);
ui::MotionEventAndroid::Pointer pointer1(0, 0, 0, 0, 0, 0, 0, 0);
ui::MotionEventAndroid event(nullptr, JavaParamRef<jobject>(nullptr), 1.f,
- 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, false,
&pointer0, &pointer1);
- root_.OnTouchEvent(event, false);
+ root_.OnTouchEvent(event);
}
void ExpectHit(const TestViewClient& hitClient) {
