summaryrefslogtreecommitdiffstats
path: root/ash/shell_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 05:58:36 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 05:58:36 +0000
commit228f0f09fab164f67f7771d3c2fadb6726ab1244 (patch)
treed1e4dc3c5c3ed2af6d2076101b20f629c29cda0f /ash/shell_unittest.cc
parente7f8d747180c8330f1dd78a97dd3a91c03d4f7ad (diff)
downloadchromium_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/shell_unittest.cc')
-rw-r--r--ash/shell_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 5652115..c41163b 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -400,8 +400,8 @@ TEST_F(ShellTest, ManagedWindowModeBasics) {
EXPECT_TRUE(launcher_widget->IsVisible());
// Shelf is at bottom-left of screen.
EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
- EXPECT_EQ(
- Shell::GetPrimaryRootWindow()->GetDispatcher()->GetHostSize().height(),
+ EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->
+ GetBounds().height(),
launcher_widget->GetWindowBoundsInScreen().bottom());
// We have a desktop background but not a bare layer.
// TODO (antrim): enable once we find out why it fails component build.