diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:42:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:42:27 +0000 |
| commit | 2374d1813659c2420eda25c884c5f943b292a64d (patch) | |
| tree | 580d99257dd5a9d6a84de4fa70d583d17e985b4c /ash/shell_unittest.cc | |
| parent | b5126da4daa8f0f0f408afb93e0683f1cf34c82a (diff) | |
| download | chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.zip chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.tar.gz chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.tar.bz2 | |
Window ownership -> WindowTreeHost
Replaces Window::GetDispatcher with Window::GetHost().
Had to clear ScreenPositionClient property prior to window teardown as tests on desktop delete it prior to destroying the window hierarchy. Unhooking the property appears to have no ill-effect.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/184903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index f13cbf6..7dd9246 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -398,9 +398,8 @@ TEST_F(ShellTest, ManagedWindowModeBasics) { EXPECT_TRUE(shelf_widget->IsVisible()); // Shelf is at bottom-left of screen. EXPECT_EQ(0, shelf_widget->GetWindowBoundsInScreen().x()); - EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetDispatcher()->host()-> - GetBounds().height(), - shelf_widget->GetWindowBoundsInScreen().bottom()); + EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHost()->GetBounds().height(), + shelf_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. // internal::DesktopBackgroundWidgetController* background = |