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

Unified Diff: ui/aura/root_window.cc

Issue 147203004: aura: Remove event-dispatch methods from WindowTreeHostDelegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win Created 6 years, 11 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/aura/root_window.h ('k') | ui/aura/root_window_host_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 1a72b9abe645e546a9d5323672e729483dc4c2ab..6fe53b66dc73a95a5f3706e66f809c4a51c2d6bf 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -638,7 +638,9 @@ void RootWindow::DispatchPostponedGestureEvent(ui::GestureEvent* event) {
}
void RootWindow::DispatchCancelTouchEvent(ui::TouchEvent* event) {
- OnHostTouchEvent(event);
+ DispatchDetails details = OnEventFromSource(event);
+ if (details.dispatcher_destroyed)
+ return;
}
////////////////////////////////////////////////////////////////////////////////
@@ -660,34 +662,6 @@ void RootWindow::OnLayerAnimationAborted(
////////////////////////////////////////////////////////////////////////////////
// RootWindow, WindowTreeHostDelegate implementation:
-bool RootWindow::OnHostKeyEvent(ui::KeyEvent* event) {
- DispatchDetails details = OnEventFromSource(event);
- if (details.dispatcher_destroyed)
- event->SetHandled();
- return event->handled();
-}
-
-bool RootWindow::OnHostMouseEvent(ui::MouseEvent* event) {
- DispatchDetails details = OnEventFromSource(event);
- if (details.dispatcher_destroyed)
- event->SetHandled();
- return event->handled();
-}
-
-bool RootWindow::OnHostScrollEvent(ui::ScrollEvent* event) {
- DispatchDetails details = OnEventFromSource(event);
- if (details.dispatcher_destroyed)
- event->SetHandled();
- return event->handled();
-}
-
-bool RootWindow::OnHostTouchEvent(ui::TouchEvent* event) {
- DispatchDetails details = OnEventFromSource(event);
- if (details.dispatcher_destroyed)
- event->SetHandled();
- return event->handled();
-}
-
void RootWindow::OnHostCancelMode() {
ui::CancelModeEvent event;
Window* focused_window = client::GetFocusClient(window())->GetFocusedWindow();
« no previous file with comments | « ui/aura/root_window.h ('k') | ui/aura/root_window_host_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698