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

Unified Diff: ash/shell_unittest.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/shell/window_watcher_unittest.cc ('k') | ash/sticky_keys/sticky_keys_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index f13cbf66ccbe34d2a9ff3f3e6f68bc84279d6ddb..7dd92464d787293577b809e57e767aca550f8cf9 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 =
« no previous file with comments | « ash/shell/window_watcher_unittest.cc ('k') | ash/sticky_keys/sticky_keys_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698