Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: ui/views/widget/root_view.h

Issue 533323004: Remove RootView::DispatchGestureEvent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test added, member name changed Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/root_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/root_view.h
diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h
index 247210724916578ddb843855df6826288eae4c0b..2a2a01126c0c8cdb261af3a03ad63794a49e3f8e 100644
--- a/ui/views/widget/root_view.h
+++ b/ui/views/widget/root_view.h
@@ -94,6 +94,7 @@ class VIEWS_EXPORT RootView : public View,
// Overridden from ui::EventProcessor:
virtual ui::EventTarget* GetRootTarget() OVERRIDE;
virtual ui::EventDispatchDetails OnEventFromSource(ui::Event* event) OVERRIDE;
+ virtual void OnEventProcessingFinished(ui::Event* event) OVERRIDE;
// Overridden from View:
virtual const Widget* GetWidget() const OVERRIDE;
@@ -132,11 +133,6 @@ class VIEWS_EXPORT RootView : public View,
// Input ---------------------------------------------------------------------
- // TODO(tdanderson): Remove RootView::DispatchGestureEvent() once
- // its targeting and dispatch logic has been moved
- // elsewhere. See crbug.com/348083.
- void DispatchGestureEvent(ui::GestureEvent* event);
-
// Update the cursor given a mouse event. This is called by non mouse_move
// event handlers to honor the cursor desired by views located under the
// cursor during drag operations. The location of the mouse should be in the
@@ -197,9 +193,13 @@ class VIEWS_EXPORT RootView : public View,
// The View currently handling gesture events.
View* gesture_handler_;
- // If true, then gesture events received from Widget are permitted to be
- // re-targeted and re-dispatched while they remain unhandled.
- bool allow_gesture_event_retargeting_;
+ // Used to indicate if the |gesture_handler_| member was set prior to the
+ // processing of the current event (i.e., if |gesture_handler_| was set
+ // by the dispatch of a previous gesture event).
+ // TODO(tdanderson): It may be possible to eliminate the need for this
+ // member if |event_dispatch_target_| can be used in
+ // its place.
+ bool gesture_handler_set_before_processing_;
scoped_ptr<internal::PreEventDispatchHandler> pre_dispatch_handler_;
scoped_ptr<internal::PostEventDispatchHandler> post_dispatch_handler_;
« no previous file with comments | « ui/views/view_targeter_unittest.cc ('k') | ui/views/widget/root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698