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

Unified Diff: ash/root_window_controller.cc

Issue 2891183002: chromeos: removes WmWindow usage from MultiWindowResizeController (Closed)
Patch Set: feedback and merge Created 3 years, 7 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 | « ash/root_window_controller.h ('k') | ash/wm/workspace/multi_window_resize_controller.h » ('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 9e9cb21aeb70fa70b82e0387332e1b3305df9802..e45a86f1a8bee46e54f87c20bfd80cb9c0d40e7d 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -452,7 +452,7 @@ bool RootWindowController::CanWindowReceiveEvents(aura::Window* window) {
return true;
}
-WmWindow* RootWindowController::FindEventTarget(
+aura::Window* RootWindowController::FindEventTarget(
const gfx::Point& location_in_screen) {
gfx::Point location_in_root(location_in_screen);
aura::Window* root_window = GetRootWindow();
@@ -465,7 +465,7 @@ WmWindow* RootWindowController::FindEventTarget(
->dispatcher()
->GetDefaultEventTargeter()
->FindTargetForEvent(root_window, &test_event);
- return WmWindow::Get(static_cast<aura::Window*>(event_handler));
+ return static_cast<aura::Window*>(event_handler);
}
gfx::Point RootWindowController::GetLastMouseLocationInRoot() {
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/wm/workspace/multi_window_resize_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698