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

Unified Diff: ash/root_window_controller.cc

Issue 2891183002: chromeos: removes WmWindow usage from MultiWindowResizeController (Closed)
Patch Set: cleanup 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
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index cc881532a7bebacc3a79c705c90430fd6bde8fa5..21fb98ff6ea1dc0ad4beb8eddc782c2c1e4f9bd7 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() {

Powered by Google App Engine
This is Rietveld 408576698