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

Unified Diff: ash/wm/overview/window_selector_unittest.cc

Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address build problems, add accessor and unit tests. Created 5 years, 4 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: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 6bea3bd2a0b0661a480db08a861de0a60623fdce..7d09de190efe850c3b648db5c4aaccff64090184 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -719,8 +719,10 @@ TEST_F(WindowSelectorTest, WindowDoesNotReceiveEvents) {
gfx::Point point1(window_bounds.x() + 10, window_bounds.y() + 10);
- ui::MouseEvent event1(ui::ET_MOUSE_PRESSED, point1, point1,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent event1(
+ ui::ET_MOUSE_PRESSED, point1, point1, ui::EventTimeForNow(), ui::EF_NONE,
+ ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
ui::EventTarget* root_target = root_window;
ui::EventTargeter* targeter = root_target->GetEventTargeter();
@@ -735,8 +737,10 @@ TEST_F(WindowSelectorTest, WindowDoesNotReceiveEvents) {
// The bounds have changed, take that into account.
gfx::RectF bounds = GetTransformedBoundsInRootWindow(window.get());
gfx::Point point2(bounds.x() + 10, bounds.y() + 10);
- ui::MouseEvent event2(ui::ET_MOUSE_PRESSED, point2, point2,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseEvent event2(
+ ui::ET_MOUSE_PRESSED, point2, point2, ui::EventTimeForNow(), ui::EF_NONE,
+ ui::EF_NONE,
+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
// Now the transparent window should be intercepting this event.
EXPECT_NE(window, static_cast<aura::Window*>(

Powered by Google App Engine
This is Rietveld 408576698