summaryrefslogtreecommitdiffstats
path: root/ui/aura/root_window.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-21 21:45:46 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-21 21:45:46 +0000
commit1d28d5577ce719014f84a19073e3afc180137bbb (patch)
treea0c374da5f17127549894c66e7b9b8a9d9b14bb6 /ui/aura/root_window.cc
parentc7f30a1ec1d4b66001e2dad31b52edcfb41ca024 (diff)
downloadchromium_src-1d28d5577ce719014f84a19073e3afc180137bbb.zip
chromium_src-1d28d5577ce719014f84a19073e3afc180137bbb.tar.gz
chromium_src-1d28d5577ce719014f84a19073e3afc180137bbb.tar.bz2
gesture-recognizer: Clean up GestureConsumer.
* Remove GestureConsumer::ignores_events_ since it's no longer necessary. * Remove Mirrored and CancelledTouchEvent. BUG=none R=tdresser@chromium.org, varunjain@chromium.org Review URL: https://codereview.chromium.org/28773005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.cc')
-rw-r--r--ui/aura/root_window.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 500f307..9b468bf 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -61,8 +61,7 @@ float GetDeviceScaleFactorFromDisplay(Window* window) {
}
Window* ConsumerToWindow(ui::GestureConsumer* consumer) {
- return consumer && !consumer->ignores_events() ?
- static_cast<Window*>(consumer) : NULL;
+ return consumer ? static_cast<Window*>(consumer) : NULL;
}
void SetLastMouseLocation(const RootWindow* root_window,