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

Unified Diff: ash/display/extended_mouse_warp_controller.cc

Issue 2911393002: Nix GetRootWindowController, use RootWindowController::ForWindow. (Closed)
Patch Set: Sync and rebase AGAIN 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/display/display_util_unittest.cc ('k') | ash/display/window_tree_host_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/extended_mouse_warp_controller.cc
diff --git a/ash/display/extended_mouse_warp_controller.cc b/ash/display/extended_mouse_warp_controller.cc
index ac31b33b22feb1627c0fad53553cfd453a5b37c0..7553812e14011f013d5d2b78870111318714de1c 100644
--- a/ash/display/extended_mouse_warp_controller.cc
+++ b/ash/display/extended_mouse_warp_controller.cc
@@ -77,8 +77,10 @@ ExtendedMouseWarpController::WarpRegion::WarpRegion(
aura::Window* a_window = GetRootWindowForDisplayId(a_display_id);
aura::Window* b_window = GetRootWindowForDisplayId(b_display_id);
- AshWindowTreeHost* a_ash_host = GetRootWindowController(a_window)->ash_host();
- AshWindowTreeHost* b_ash_host = GetRootWindowController(b_window)->ash_host();
+ AshWindowTreeHost* a_ash_host =
+ RootWindowController::ForWindow(a_window)->ash_host();
+ AshWindowTreeHost* b_ash_host =
+ RootWindowController::ForWindow(b_window)->ash_host();
a_edge_bounds_in_native_ =
GetNativeEdgeBounds(a_ash_host, a_indicator_bounds);
@@ -189,7 +191,7 @@ bool ExtendedMouseWarpController::WarpMouseCursorInNativeCoords(
aura::Window* dst_window = GetRootWindowForDisplayId(
in_a_edge ? warp->b_display_id_ : warp->a_display_id_);
AshWindowTreeHost* target_ash_host =
- GetRootWindowController(dst_window)->ash_host();
+ RootWindowController::ForWindow(dst_window)->ash_host();
MoveCursorTo(target_ash_host, point_in_screen, update_mouse_location_now);
return true;
« no previous file with comments | « ash/display/display_util_unittest.cc ('k') | ash/display/window_tree_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698