diff options
| author | moshayedi <moshayedi@chromium.org> | 2016-03-01 06:34:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 14:35:25 +0000 |
| commit | 03e3e6721c4f77dfe862b40f42ad55a0ebe18403 (patch) | |
| tree | 4ce761c04a33ec6f685c998722034c39115037ff /components/mus/ws/window_tree_unittest.cc | |
| parent | 870d7ed29cd1d7aaa68296474bfd6cbd4fd642cf (diff) | |
| download | chromium_src-03e3e6721c4f77dfe862b40f42ad55a0ebe18403.zip chromium_src-03e3e6721c4f77dfe862b40f42ad55a0ebe18403.tar.gz chromium_src-03e3e6721c4f77dfe862b40f42ad55a0ebe18403.tar.bz2 | |
Remove mojom::EventPtr from EventDispatcher.
We want to get rid of mojom::EventPtr and use ui::Event instead at some point.
This is the first step in doing so, which removes mojom::EventPtr from
EventDispatcher and EventDispatcherDelegate.
BUG=578206
Review URL: https://codereview.chromium.org/1641673003
Cr-Commit-Position: refs/heads/master@{#378428}
Diffstat (limited to 'components/mus/ws/window_tree_unittest.cc')
| -rw-r--r-- | components/mus/ws/window_tree_unittest.cc | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc index d341c46..e31150f 100644 --- a/components/mus/ws/window_tree_unittest.cc +++ b/components/mus/ws/window_tree_unittest.cc @@ -366,31 +366,34 @@ class TestDisplayManagerFactory : public DisplayManagerFactory { DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerFactory); }; -ui::TouchEvent CreatePointerDownEvent(int x, int y) { - return ui::TouchEvent(ui::ET_TOUCH_PRESSED, gfx::Point(x, y), 1, - ui::EventTimeForNow()); +ui::PointerEvent CreatePointerDownEvent(int x, int y) { + return ui::PointerEvent(ui::TouchEvent(ui::ET_TOUCH_PRESSED, gfx::Point(x, y), + 1, ui::EventTimeForNow())); } -ui::TouchEvent CreatePointerUpEvent(int x, int y) { - return ui::TouchEvent(ui::ET_TOUCH_RELEASED, gfx::Point(x, y), 1, - ui::EventTimeForNow()); +ui::PointerEvent CreatePointerUpEvent(int x, int y) { + return ui::PointerEvent(ui::TouchEvent( + ui::ET_TOUCH_RELEASED, gfx::Point(x, y), 1, ui::EventTimeForNow())); } -ui::MouseEvent CreateMouseMoveEvent(int x, int y) { - return ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(x, y), gfx::Point(x, y), - ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE); +ui::PointerEvent CreateMouseMoveEvent(int x, int y) { + return ui::PointerEvent( + ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(x, y), gfx::Point(x, y), + ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE)); } -ui::MouseEvent CreateMouseDownEvent(int x, int y) { - return ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(x, y), - gfx::Point(x, y), ui::EventTimeForNow(), - ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON); +ui::PointerEvent CreateMouseDownEvent(int x, int y) { + return ui::PointerEvent( + ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(x, y), gfx::Point(x, y), + ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, + ui::EF_LEFT_MOUSE_BUTTON)); } -ui::MouseEvent CreateMouseUpEvent(int x, int y) { - return ui::MouseEvent(ui::ET_MOUSE_RELEASED, gfx::Point(x, y), - gfx::Point(x, y), ui::EventTimeForNow(), - ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON); +ui::PointerEvent CreateMouseUpEvent(int x, int y) { + return ui::PointerEvent( + ui::MouseEvent(ui::ET_MOUSE_RELEASED, gfx::Point(x, y), gfx::Point(x, y), + ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, + ui::EF_LEFT_MOUSE_BUTTON)); } const ServerWindow* FirstRoot(WindowTreeImpl* connection) { |