diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 13:31:45 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 13:31:45 +0000 |
| commit | 64a5a8cb4268b15ea6ec734a00114ef30f9381fb (patch) | |
| tree | acf46e4070851d9be1ca5dfcd01d0ac0af557f71 /ui/aura/root_window.h | |
| parent | 676c561eae941ee83445be73fb9148859bfcdf64 (diff) | |
| download | chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.zip chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.tar.gz chromium_src-64a5a8cb4268b15ea6ec734a00114ef30f9381fb.tar.bz2 | |
Gesture recognizer must be a singleton accross all aura::RootWindows
BUG=279317
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=229753
R=sadrul@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/25350006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.h')
| -rw-r--r-- | ui/aura/root_window.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index b8c4455..7c84fa7 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -208,13 +208,6 @@ class AURA_EXPORT RootWindow : public Window, Window* window, ui::EventResult result); - ui::GestureRecognizer* gesture_recognizer() const { - return gesture_recognizer_.get(); - } - - // Provided only for testing: - void SetGestureRecognizerForTesting(ui::GestureRecognizer* gr); - // Returns the accelerated widget from the RootWindowHost. gfx::AcceleratedWidget GetAcceleratedWidget(); @@ -318,8 +311,9 @@ class AURA_EXPORT RootWindow : public Window, virtual bool CanDispatchToTarget(EventTarget* target) OVERRIDE; // Overridden from ui::GestureEventHelper. - virtual bool DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual bool DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE; + virtual void DispatchLongPressGestureEvent(ui::GestureEvent* event) OVERRIDE; + virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE; // Overridden from ui::LayerAnimationObserver: virtual void OnLayerAnimationEnded( @@ -386,9 +380,6 @@ class AURA_EXPORT RootWindow : public Window, Window* mouse_moved_handler_; Window* event_dispatch_target_; - // The gesture_recognizer_ for this. - scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; - bool synthesize_mouse_move_; bool waiting_on_compositing_end_; bool draw_on_compositing_end_; |