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

Unified Diff: ash/root_window_controller.cc

Issue 2715743005: Revert of Avoid two targeting phases in aura client-lib and EventProcessor. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index f621e8057ae19b9a32e3ed749acc0549d112234c..dde74bfe0942b6acf274acfe1c779490e324b9ae 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -486,9 +486,8 @@
location_in_root, ui::EventTimeForNow(),
ui::EF_NONE, ui::EF_NONE);
ui::EventTarget* event_handler =
- root_window->GetHost()
- ->dispatcher()
- ->GetDefaultEventTargeter()
+ static_cast<ui::EventTarget*>(root_window)
+ ->GetEventTargeter()
->FindTargetForEvent(root_window, &test_event);
return WmWindow::Get(static_cast<aura::Window*>(event_handler));
}
« no previous file with comments | « no previous file | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698