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

Unified Diff: ui/aura/mus/window_tree_client_unittest.cc

Issue 2753163004: Remove ID from ui::PointerEvent's constructors (Closed)
Patch Set: Created 3 years, 9 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 | « services/ui/ws/window_manager_state_unittest.cc ('k') | ui/events/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_tree_client_unittest.cc
diff --git a/ui/aura/mus/window_tree_client_unittest.cc b/ui/aura/mus/window_tree_client_unittest.cc
index 0cb895ab493dbb7afa6b1c3ff07d3713d02e1c0f..48f70408ebc60df5749469a6621af3a7d6f53b21 100644
--- a/ui/aura/mus/window_tree_client_unittest.cc
+++ b/ui/aura/mus/window_tree_client_unittest.cc
@@ -890,8 +890,8 @@ TEST_F(WindowTreeClientPointerObserverTest, OnPointerEventObserved) {
// Simulate the server sending an observed event.
std::unique_ptr<ui::PointerEvent> pointer_event_down(new ui::PointerEvent(
- ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
- 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+ ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
base::TimeTicks()));
window_tree_client()->OnPointerEventObserved(std::move(pointer_event_down),
0u, 0);
@@ -908,8 +908,8 @@ TEST_F(WindowTreeClientPointerObserverTest, OnPointerEventObserved) {
// Simulate another event from the server.
std::unique_ptr<ui::PointerEvent> pointer_event_up(new ui::PointerEvent(
- ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1, 0,
- ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+ ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
base::TimeTicks()));
window_tree_client()->OnPointerEventObserved(std::move(pointer_event_up), 0u,
0);
@@ -932,8 +932,8 @@ TEST_F(WindowTreeClientPointerObserverTest,
// Simulate the server dispatching an event that also matched the observer.
std::unique_ptr<ui::PointerEvent> pointer_event_down(new ui::PointerEvent(
- ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
- 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+ ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
base::TimeTicks::Now()));
window_tree_client()->OnWindowInputEvent(1, server_id(top_level.get()), 0,
std::move(pointer_event_down), true);
@@ -1937,8 +1937,8 @@ TEST_F(WindowTreeClientClientTestHighDPI, PointerEventsInDip) {
const gfx::Point root_location_pixels(14, 16);
std::unique_ptr<ui::PointerEvent> pointer_event_down(new ui::PointerEvent(
ui::ET_POINTER_DOWN, location_pixels, root_location_pixels,
- ui::EF_CONTROL_DOWN, 1, 0,
- ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
+ ui::EF_CONTROL_DOWN, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 1),
base::TimeTicks()));
window_tree_client()->OnPointerEventObserved(std::move(pointer_event_down),
0u, primary_display.id());
« no previous file with comments | « services/ui/ws/window_manager_state_unittest.cc ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698