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

Unified Diff: ash/display/screen_position_controller_unittest.cc

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month 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/screen_position_controller.cc ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_position_controller_unittest.cc
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
index f3b8d655c35277aee553f7afe56cefacea558983..a9996c25eb00c571c505633891990b2f88facc1e 100644
--- a/ash/display/screen_position_controller_unittest.cc
+++ b/ash/display/screen_position_controller_unittest.cc
@@ -89,14 +89,14 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
- EXPECT_EQ("100,100",
- root_windows[0]->GetDispatcher()->GetHostOrigin().ToString());
- EXPECT_EQ("200x200",
- root_windows[0]->GetDispatcher()->GetHostSize().ToString());
- EXPECT_EQ("100,500",
- root_windows[1]->GetDispatcher()->GetHostOrigin().ToString());
- EXPECT_EQ("200x200",
- root_windows[1]->GetDispatcher()->GetHostSize().ToString());
+ EXPECT_EQ("100,100", root_windows[0]->GetDispatcher()->host()->
+ GetBounds().origin().ToString());
+ EXPECT_EQ("200x200", root_windows[0]->GetDispatcher()->host()->
+ GetBounds().size().ToString());
+ EXPECT_EQ("100,500", root_windows[1]->GetDispatcher()->host()->
+ GetBounds().origin().ToString());
+ EXPECT_EQ("200x200", root_windows[1]->GetDispatcher()->host()->
+ GetBounds().size().ToString());
const gfx::Point window_pos(100, 100);
window_->SetBoundsInScreen(
@@ -178,13 +178,17 @@ TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
aura::Window::Windows root_windows =
Shell::GetInstance()->GetAllRootWindows();
EXPECT_EQ("100,100",
- root_windows[0]->GetDispatcher()->GetHostOrigin().ToString());
+ root_windows[0]->GetDispatcher()->host()->
+ GetBounds().origin().ToString());
EXPECT_EQ("200x200",
- root_windows[0]->GetDispatcher()->GetHostSize().ToString());
+ root_windows[0]->GetDispatcher()->host()->
+ GetBounds().size().ToString());
EXPECT_EQ("100,500",
- root_windows[1]->GetDispatcher()->GetHostOrigin().ToString());
+ root_windows[1]->GetDispatcher()->host()->
+ GetBounds().origin().ToString());
EXPECT_EQ("200x200",
- root_windows[1]->GetDispatcher()->GetHostSize().ToString());
+ root_windows[1]->GetDispatcher()->host()->
+ GetBounds().size().ToString());
// Put |window_| to the primary 2x display.
window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
« no previous file with comments | « ash/display/screen_position_controller.cc ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698