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

Unified Diff: ash/wm/root_window_event_filter_unittest.cc

Issue 9452024: Gestures are now possible using touch events with any ids (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Allow consecutive touch presses with the same touch-id. Created 8 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 | « no previous file | ui/aura/gestures/gesture_point.h » ('j') | ui/aura/gestures/gesture_point.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/root_window_event_filter_unittest.cc
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index c4e41bdaada1c79be21c21ee3033782be775c5f0..efc2820d7dc151bc8cb8a7f156b23b0d9bd91377 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -325,7 +325,7 @@ TEST_F(RootWindowEventFilterTest, ActivateOnTouch) {
press_point = w1->bounds().CenterPoint();
aura::Window::ConvertPointToWindow(w1->parent(), root_window, &press_point);
d1.set_activate(false);
- aura::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 0);
+ aura::TouchEvent touchev2(ui::ET_TOUCH_PRESSED, press_point, 1);
root_window->DispatchTouchEvent(&touchev2);
// Window2 should still be active and focused.
@@ -547,13 +547,15 @@ TEST_F(RootWindowEventFilterTest, UpdateCursorVisibility) {
aura::MouseEvent mouse_moved(
ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
- aura::TouchEvent touch_pressed(
+ aura::TouchEvent touch_pressed1(
ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0);
+ aura::TouchEvent touch_pressed2(
+ ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 1);
root_window_filter->set_update_cursor_visibility(true);
root_window->DispatchMouseEvent(&mouse_moved);
EXPECT_TRUE(root_window->cursor_shown());
- root_window->DispatchTouchEvent(&touch_pressed);
+ root_window->DispatchTouchEvent(&touch_pressed1);
EXPECT_FALSE(root_window->cursor_shown());
root_window->DispatchMouseEvent(&mouse_moved);
EXPECT_TRUE(root_window->cursor_shown());
@@ -563,7 +565,7 @@ TEST_F(RootWindowEventFilterTest, UpdateCursorVisibility) {
root_window->DispatchMouseEvent(&mouse_moved);
EXPECT_FALSE(root_window->cursor_shown());
root_window->ShowCursor(true);
- root_window->DispatchTouchEvent(&touch_pressed);
+ root_window->DispatchTouchEvent(&touch_pressed2);
EXPECT_TRUE(root_window->cursor_shown());
}
« no previous file with comments | « no previous file | ui/aura/gestures/gesture_point.h » ('j') | ui/aura/gestures/gesture_point.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698