summaryrefslogtreecommitdiffstats
path: root/ash/autoclick
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-17 21:20:50 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-17 21:20:50 +0000
commitf58bbf1c0177717e5541eef8f81d15d44761bb54 (patch)
tree401b8e12f485fb59075364e3f375ed4327fd2840 /ash/autoclick
parentc02c62ddc7f422440977d51011ae7d84ae5bee76 (diff)
downloadchromium_src-f58bbf1c0177717e5541eef8f81d15d44761bb54.zip
chromium_src-f58bbf1c0177717e5541eef8f81d15d44761bb54.tar.gz
chromium_src-f58bbf1c0177717e5541eef8f81d15d44761bb54.tar.bz2
Changes MouseEvent constructor to take changed_button_flags.
I want this for EventGenerator, but it seems best to make everyone think about this rather than create another constructor. BUG=none TEST=none R=sadrul@chromium.org Review URL: https://codereview.chromium.org/101573006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/autoclick')
-rw-r--r--ash/autoclick/autoclick_controller.cc6
-rw-r--r--ash/autoclick/autoclick_unittest.cc3
2 files changed, 6 insertions, 3 deletions
diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
index 9b49ca2..ec8977b 100644
--- a/ash/autoclick/autoclick_controller.cc
+++ b/ash/autoclick/autoclick_controller.cc
@@ -191,11 +191,13 @@ void AutoclickControllerImpl::DoAutoclick() {
ui::MouseEvent press_event(ui::ET_MOUSE_PRESSED,
click_location,
click_location,
- mouse_event_flags_ | ui::EF_LEFT_MOUSE_BUTTON);
+ mouse_event_flags_ | ui::EF_LEFT_MOUSE_BUTTON,
+ ui::EF_LEFT_MOUSE_BUTTON);
ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED,
click_location,
click_location,
- mouse_event_flags_ | ui::EF_LEFT_MOUSE_BUTTON);
+ mouse_event_flags_ | ui::EF_LEFT_MOUSE_BUTTON,
+ ui::EF_LEFT_MOUSE_BUTTON);
dispatcher->AsRootWindowHostDelegate()->OnHostMouseEvent(&press_event);
dispatcher->AsRootWindowHostDelegate()->OnHostMouseEvent(&release_event);
diff --git a/ash/autoclick/autoclick_unittest.cc b/ash/autoclick/autoclick_unittest.cc
index 96f17cf..5151a9a7 100644
--- a/ash/autoclick/autoclick_unittest.cc
+++ b/ash/autoclick/autoclick_unittest.cc
@@ -36,7 +36,8 @@ class MouseEventCapturer : public ui::EventHandler {
event->type(),
event->location(),
event->root_location(),
- event->flags()));
+ event->flags(),
+ event->changed_button_flags()));
// Stop event propagation so we don't click on random stuff that
// might break test assumptions.
event->StopPropagation();