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

Unified Diff: views/view_unittest.cc

Issue 6488012: Revert 74518 - Refactor TOUCH_UI to match other refactor.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | « views/touchui/gesture_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/view_unittest.cc
===================================================================
--- views/view_unittest.cc (revision 74519)
+++ views/view_unittest.cc (working copy)
@@ -415,7 +415,7 @@
dispatched_synthetic_event_ = false;
return false;
}
- last_touch_event_ = event.type();
+ last_touch_event_ = event.GetType();
last_view_ = source;
previously_handled_flag_ = status != View::TOUCH_STATUS_UNKNOWN;
dispatched_synthetic_event_ = true;
@@ -426,15 +426,15 @@
}
View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
- last_touch_event_type_ = event.type();
+ last_touch_event_type_ = event.GetType();
location_.SetPoint(event.x(), event.y());
if (!in_touch_sequence_) {
- if (event.type() == ui::ET_TOUCH_PRESSED) {
+ if (event.GetType() == ui::ET_TOUCH_PRESSED) {
in_touch_sequence_ = true;
return TOUCH_STATUS_START;
}
} else {
- if (event.type() == ui::ET_TOUCH_RELEASED) {
+ if (event.GetType() == ui::ET_TOUCH_RELEASED) {
in_touch_sequence_ = false;
return TOUCH_STATUS_END;
}
« no previous file with comments | « views/touchui/gesture_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698