diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 17:46:04 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 17:46:04 +0000 |
commit | 538f956734244278d1d82e959bfd2a54a5537cd5 (patch) | |
tree | 2bfaaa4aa666e696af9ebab5b4871e8b55004480 /ash/accelerators | |
parent | 04bdebfa5c0a7aee88220c20b3b8d483f79a3d12 (diff) | |
download | chromium_src-538f956734244278d1d82e959bfd2a54a5537cd5.zip chromium_src-538f956734244278d1d82e959bfd2a54a5537cd5.tar.gz chromium_src-538f956734244278d1d82e959bfd2a54a5537cd5.tar.bz2 |
aura: Gesture event plumbing (skeleton).
Add gesture event plumbing through aura. This is not functional just yet.
Subsequent CLs will move the gesture-recognizer from views into aura,
which will then generate and deliver aura gesture events.
BUG=11024
TEST=no functional changes yet. Tests will be added when GR is moved into aura.
Review URL: https://chromiumcodereview.appspot.com/9221014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
-rw-r--r-- | ash/accelerators/accelerator_filter.cc | 8 | ||||
-rw-r--r-- | ash/accelerators/accelerator_filter.h | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc index f2e4b6e..35cadd0 100644 --- a/ash/accelerators/accelerator_filter.cc +++ b/ash/accelerators/accelerator_filter.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -54,5 +54,11 @@ ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent( return ui::TOUCH_STATUS_UNKNOWN; } +ui::GestureStatus AcceleratorFilter::PreHandleGestureEvent( + aura::Window* target, + aura::GestureEvent* event) { + return ui::GESTURE_STATUS_UNKNOWN; +} + } // namespace internal } // namespace ash diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h index 56ebfb1..8e6883b 100644 --- a/ash/accelerators/accelerator_filter.h +++ b/ash/accelerators/accelerator_filter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,6 +28,9 @@ class ASH_EXPORT AcceleratorFilter : public aura::EventFilter { aura::MouseEvent* event) OVERRIDE; virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, aura::TouchEvent* event) OVERRIDE; + virtual ui::GestureStatus PreHandleGestureEvent( + aura::Window* target, + aura::GestureEvent* event) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter); |