diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 06:48:00 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 06:48:00 +0000 |
| commit | 925a1b8080b3dc258242da54a294f8107cd24712 (patch) | |
| tree | dc05b8c5cf8407223578e190e8684e64bf980d6d /ash/display | |
| parent | c577b2cde316c01c422fbfdfb23cbdd8e20e2ac4 (diff) | |
| download | chromium_src-925a1b8080b3dc258242da54a294f8107cd24712.zip chromium_src-925a1b8080b3dc258242da54a294f8107cd24712.tar.gz chromium_src-925a1b8080b3dc258242da54a294f8107cd24712.tar.bz2 | |
aura: Some event-related cleanup in RootWindow.
The RootWindow no longer needs to keep track of the mouse-flags. So remove
|mouse_button_flags_|. Also, make sure the synthesized mouse-enter/exit
events have the EF_IS_SYNTHESIZED flag set.
BUG=none
R=sky@chromium.org
Review URL: https://codereview.chromium.org/17287013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 84017ce..79be192 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -119,8 +119,11 @@ class TestEventHandler : public ui::EventHandler { virtual ~TestEventHandler() {} virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE { - if (event->flags() & ui::EF_IS_SYNTHESIZED) + if (event->flags() & ui::EF_IS_SYNTHESIZED && + event->type() != ui::ET_MOUSE_EXITED && + event->type() != ui::ET_MOUSE_ENTERED) { return; + } aura::Window* target = static_cast<aura::Window*>(event->target()); mouse_location_ = event->root_location(); target_root_ = target->GetRootWindow(); |