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

Unified Diff: ui/aura/window_tree_host.h

Issue 503883004: Don't pass touches to gesture recognizer for async acks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address sadrul's comments. Created 5 years, 10 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
Index: ui/aura/window_tree_host.h
diff --git a/ui/aura/window_tree_host.h b/ui/aura/window_tree_host.h
index b08391ffcf6ac3d44bdd5085c7c44b2e5699655c..34f7c7ad3653501cdf1dd250b4c30b7ff8b39326 100644
--- a/ui/aura/window_tree_host.h
+++ b/ui/aura/window_tree_host.h
@@ -66,7 +66,6 @@ class AURA_EXPORT WindowTreeHost {
return const_cast<WindowEventDispatcher*>(
const_cast<const WindowTreeHost*>(this)->dispatcher());
}
- const WindowEventDispatcher* dispatcher() const { return dispatcher_.get(); }
ui::Compositor* compositor() { return compositor_.get(); }
@@ -182,7 +181,7 @@ class AURA_EXPORT WindowTreeHost {
ObserverList<WindowTreeHostObserver> observers_;
- scoped_ptr<WindowEventDispatcher> dispatcher_;
+ const WindowEventDispatcher* dispatcher() const { return dispatcher_.get(); }
scoped_ptr<ui::Compositor> compositor_;
@@ -191,6 +190,7 @@ class AURA_EXPORT WindowTreeHost {
gfx::Point last_cursor_request_position_in_host_;
scoped_ptr<ui::ViewProp> prop_;
+ scoped_ptr<WindowEventDispatcher> dispatcher_;
DISALLOW_COPY_AND_ASSIGN(WindowTreeHost);
};
« no previous file with comments | « ui/aura/window_event_dispatcher_unittest.cc ('k') | ui/events/gesture_detection/touch_disposition_gesture_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698