summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_modality_controller.h
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-04 05:14:40 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-04 05:14:40 +0000
commit3049477e7bf3d8b043fa8910ecb54506859c559f (patch)
tree21fccc92ab3afa8c821edb53783d0dd28a8dec3b /ash/wm/window_modality_controller.h
parent887c426e90a71ba51e80ffec8c30fcf1783c7c83 (diff)
downloadchromium_src-3049477e7bf3d8b043fa8910ecb54506859c559f.zip
chromium_src-3049477e7bf3d8b043fa8910ecb54506859c559f.tar.gz
chromium_src-3049477e7bf3d8b043fa8910ecb54506859c559f.tar.bz2
ui: Remove TouchStatus in favour of EventResult.
BUG=none Review URL: https://codereview.chromium.org/11364062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_modality_controller.h')
-rw-r--r--ash/wm/window_modality_controller.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/window_modality_controller.h b/ash/wm/window_modality_controller.h
index 76fc6dd..9e6b5eb 100644
--- a/ash/wm/window_modality_controller.h
+++ b/ash/wm/window_modality_controller.h
@@ -42,7 +42,7 @@ class WindowModalityController : public aura::EventFilter,
ui::KeyEvent* event) OVERRIDE;
virtual bool PreHandleMouseEvent(aura::Window* target,
ui::MouseEvent* event) OVERRIDE;
- virtual ui::TouchStatus PreHandleTouchEvent(
+ virtual ui::EventResult PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) OVERRIDE;
virtual ui::EventResult PreHandleGestureEvent(