diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 05:58:36 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 05:58:36 +0000 |
| commit | 228f0f09fab164f67f7771d3c2fadb6726ab1244 (patch) | |
| tree | d1e4dc3c5c3ed2af6d2076101b20f629c29cda0f /ash/display/screen_position_controller_unittest.cc | |
| parent | e7f8d747180c8330f1dd78a97dd3a91c03d4f7ad (diff) | |
| download | chromium_src-228f0f09fab164f67f7771d3c2fadb6726ab1244.zip chromium_src-228f0f09fab164f67f7771d3c2fadb6726ab1244.tar.gz chromium_src-228f0f09fab164f67f7771d3c2fadb6726ab1244.tar.bz2 | |
Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/72503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/screen_position_controller_unittest.cc')
| -rw-r--r-- | ash/display/screen_position_controller_unittest.cc | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc index f3b8d65..a9996c2 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), |