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

Unified Diff: views/focus/accelerator_handler_touch.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 | « chrome/browser/ui/views/dropdown_bar_host_gtk.cc ('k') | views/native_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/focus/accelerator_handler_touch.cc
===================================================================
--- views/focus/accelerator_handler_touch.cc (revision 74519)
+++ views/focus/accelerator_handler_touch.cc (working copy)
@@ -99,7 +99,7 @@
if (!touch_event) {
// Show the cursor, and decide whether or not the cursor should be
// automatically hidden after a certain time of inactivity.
- int button_flags = mouseev.flags() & (ui::EF_RIGHT_BUTTON_DOWN |
+ int button_flags = mouseev.GetFlags() & (ui::EF_RIGHT_BUTTON_DOWN |
ui::EF_MIDDLE_BUTTON_DOWN | ui::EF_LEFT_BUTTON_DOWN);
bool start_timer = false;
@@ -130,7 +130,7 @@
root->OnMouseReleased(mouseev, false);
return true;
case XI_Motion: {
- if (mouseev.type() == ui::ET_MOUSE_DRAGGED) {
+ if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) {
return root->OnMouseDragged(mouseev);
} else {
root->OnMouseMoved(mouseev);
@@ -188,7 +188,7 @@
case MotionNotify: {
MouseEvent mouseev(xev);
- if (mouseev.type() == ui::ET_MOUSE_DRAGGED) {
+ if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) {
return root->OnMouseDragged(mouseev);
} else {
root->OnMouseMoved(mouseev);
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host_gtk.cc ('k') | views/native_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698