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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor 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 | « ui/app_list/views/speech_view_unittest.cc ('k') | ui/aura/test/ui_controls_factory_ozone.cc » ('j') | ui/events/event.h » ('J')
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 9a1d141131dd2e34967dcdbc53ec4b203e342fa4..d6f983ce339a66bc02d6b4d6ceffe0b53d56cca4 100644
--- a/ui/aura/mus/window_tree_client_unittest.cc
+++ b/ui/aura/mus/window_tree_client_unittest.cc
@@ -593,9 +593,10 @@ TEST_F(WindowTreeClientClientTest, InputEventBasic) {
const gfx::Point event_location_in_child(2, 3);
const uint32_t event_id = 1;
window_delegate.set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location_in_child,
- gfx::Point(), ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location_in_child, gfx::Point(),
+ ui::EventTimeForNow(), ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(&child), window_tree_host.display_id(),
ui::Event::Clone(*ui_event.get()), 0);
@@ -640,9 +641,10 @@ TEST_F(WindowTreeClientClientTest, InputEventFindTargetAndConversion) {
uint32_t event_id = 1;
window_delegate1.set_event_id(event_id);
window_delegate2.set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location, gfx::Point(),
- ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location, gfx::Point(), ui::EventTimeForNow(),
+ ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(&child1), window_tree_host.display_id(),
ui::Event::Clone(*ui_event.get()), 0);
@@ -661,9 +663,10 @@ TEST_F(WindowTreeClientClientTest, InputEventFindTargetAndConversion) {
event_id = 2;
window_delegate1.set_event_id(event_id);
window_delegate2.set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event1(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location, gfx::Point(),
- ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event1(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location, gfx::Point(), ui::EventTimeForNow(),
+ ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(&child1), window_tree_host.display_id(),
ui::Event::Clone(*ui_event1.get()), 0);
@@ -708,9 +711,10 @@ TEST_F(WindowTreeClientClientTest, InputEventCustomWindowTargeter) {
uint32_t event_id = 1;
window_delegate1.set_event_id(event_id);
window_delegate2.set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location, gfx::Point(),
- ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location, gfx::Point(), ui::EventTimeForNow(),
+ ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(&child1), window_tree_host.display_id(),
ui::Event::Clone(*ui_event.get()), 0);
@@ -776,9 +780,10 @@ TEST_F(WindowTreeClientClientTest, InputEventCaptureWindow) {
uint32_t event_id = 1;
window_delegate1->set_event_id(event_id);
window_delegate2->set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location, gfx::Point(),
- ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location, gfx::Point(), ui::EventTimeForNow(),
+ ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(child1.get()), window_tree_host->display_id(),
ui::Event::Clone(*ui_event.get()), 0);
@@ -840,9 +845,10 @@ TEST_F(WindowTreeClientClientTest, InputEventRootWindow) {
const uint32_t event_id = 1;
root_handler.set_event_id(event_id);
child_delegate.set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location_in_child,
- gfx::Point(), ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location_in_child, gfx::Point(),
+ ui::EventTimeForNow(), ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(top_level), window_tree_host.display_id(),
ui::Event::Clone(*ui_event.get()), 0);
@@ -1999,9 +2005,10 @@ TEST_F(WindowTreeClientClientTestHighDPI, InputEventsInDip) {
uint32_t event_id = 1;
window_delegate1.set_event_id(event_id);
window_delegate2.set_event_id(event_id);
- std::unique_ptr<ui::Event> ui_event(
- new ui::MouseEvent(ui::ET_MOUSE_MOVED, event_location_in_pixels,
- gfx::Point(), ui::EventTimeForNow(), ui::EF_NONE, 0));
+ std::unique_ptr<ui::Event> ui_event(new ui::MouseEvent(
+ ui::ET_MOUSE_MOVED, event_location_in_pixels, gfx::Point(),
+ ui::EventTimeForNow(), ui::EF_NONE, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
window_tree_client()->OnWindowInputEvent(
event_id, server_id(&child1), window_tree_host.display_id(),
ui::Event::Clone(*ui_event.get()), 0);
« no previous file with comments | « ui/app_list/views/speech_view_unittest.cc ('k') | ui/aura/test/ui_controls_factory_ozone.cc » ('j') | ui/events/event.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698