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

Unified Diff: ash/shell_unittest.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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/lock_view.cc ('k') | ash/test/ash_test_base.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 88e8fd9f7b302b3f2155551d88b3e8418491ed5b..59d17c789cd5b936615c7dc5457dbb00e215a745 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -270,7 +270,7 @@ TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
EXPECT_TRUE(launcher_widget->IsVisible());
// Launcher is at bottom-left of screen.
EXPECT_EQ(0, launcher_widget->GetWindowScreenBounds().x());
- EXPECT_EQ(Shell::GetRootWindow()->GetHostSize().height(),
+ EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(),
launcher_widget->GetWindowScreenBounds().bottom());
// We have a desktop background but not a bare layer.
EXPECT_TRUE(test_api.root_window_layout()->background_widget());
« no previous file with comments | « ash/shell/lock_view.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698