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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_util_unittest.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/cursor_window_controller.cc ('k') | ash/display/extended_mouse_warp_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_util_unittest.cc
diff --git a/ash/display/display_util_unittest.cc b/ash/display/display_util_unittest.cc
index 9ec1d0d361e811b204d0eb7c5750024362c0b021..33f0232a330e19daac0f61bf96798896652c42b6 100644
--- a/ash/display/display_util_unittest.cc
+++ b/ash/display/display_util_unittest.cc
@@ -17,9 +17,9 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
UpdateDisplay("10+10-500x400,600+10-1000x600/r");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
AshWindowTreeHost* host0 =
- GetRootWindowController(root_windows[0])->ash_host();
+ RootWindowController::ForWindow(root_windows[0])->ash_host();
AshWindowTreeHost* host1 =
- GetRootWindowController(root_windows[1])->ash_host();
+ RootWindowController::ForWindow(root_windows[1])->ash_host();
gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
EXPECT_EQ("509,20 1x300", rect0.ToString());
@@ -29,9 +29,9 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
UpdateDisplay("10+10-500x400,600+10-1000x600/l");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
AshWindowTreeHost* host0 =
- GetRootWindowController(root_windows[0])->ash_host();
+ RootWindowController::ForWindow(root_windows[0])->ash_host();
AshWindowTreeHost* host1 =
- GetRootWindowController(root_windows[1])->ash_host();
+ RootWindowController::ForWindow(root_windows[1])->ash_host();
gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
EXPECT_EQ("509,20 1x300", rect0.ToString());
@@ -41,9 +41,9 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
UpdateDisplay("10+10-500x400,600+10-1000x600/u");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
AshWindowTreeHost* host0 =
- GetRootWindowController(root_windows[0])->ash_host();
+ RootWindowController::ForWindow(root_windows[0])->ash_host();
AshWindowTreeHost* host1 =
- GetRootWindowController(root_windows[1])->ash_host();
+ RootWindowController::ForWindow(root_windows[1])->ash_host();
gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
EXPECT_EQ("509,20 1x300", rect0.ToString());
@@ -54,9 +54,9 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
UpdateDisplay("10+10-500x400/r,600+10-1000x600");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
AshWindowTreeHost* host0 =
- GetRootWindowController(root_windows[0])->ash_host();
+ RootWindowController::ForWindow(root_windows[0])->ash_host();
AshWindowTreeHost* host1 =
- GetRootWindowController(root_windows[1])->ash_host();
+ RootWindowController::ForWindow(root_windows[1])->ash_host();
gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(399, 10, 1, 300));
gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(400, 10, 1, 300));
EXPECT_EQ("199,409 300x1", rect0.ToString());
@@ -66,9 +66,9 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
UpdateDisplay("10+10-500x400/l,600+10-1000x600");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
AshWindowTreeHost* host0 =
- GetRootWindowController(root_windows[0])->ash_host();
+ RootWindowController::ForWindow(root_windows[0])->ash_host();
AshWindowTreeHost* host1 =
- GetRootWindowController(root_windows[1])->ash_host();
+ RootWindowController::ForWindow(root_windows[1])->ash_host();
gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
EXPECT_EQ("20,10 300x1", rect0.ToString());
@@ -78,9 +78,9 @@ TEST_F(DisplayUtilTest, RotatedDisplay) {
UpdateDisplay("10+10-500x400/u,600+10-1000x600");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
AshWindowTreeHost* host0 =
- GetRootWindowController(root_windows[0])->ash_host();
+ RootWindowController::ForWindow(root_windows[0])->ash_host();
AshWindowTreeHost* host1 =
- GetRootWindowController(root_windows[1])->ash_host();
+ RootWindowController::ForWindow(root_windows[1])->ash_host();
gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
EXPECT_EQ("10,99 1x300", rect0.ToString());
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/extended_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698