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

Unified Diff: ash/shell_unittest.cc

Issue 2524873002: Rename WindowTreeHost G|SetBounds to indicate they are in pixels. (Closed)
Patch Set: rebase Created 4 years, 1 month 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/host/transformer_helper.cc ('k') | ash/wm/boot_splash_screen_chromeos.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 db5d29cf35bcf4fc45ca521ca4fc4200d070740b..b3452c5bbd8240dafe102bd356d7e7185432113c 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -375,8 +375,9 @@ 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()->GetHost()->GetBounds().height(),
- shelf_widget->GetWindowBoundsInScreen().bottom());
+ EXPECT_EQ(
+ Shell::GetPrimaryRootWindow()->GetHost()->GetBoundsInPixels().height(),
+ shelf_widget->GetWindowBoundsInScreen().bottom());
// We have a wallpaper but not a bare layer.
// TODO (antrim): enable once we find out why it fails component build.
// WallpaperWidgetController* wallpaper =
« no previous file with comments | « ash/host/transformer_helper.cc ('k') | ash/wm/boot_splash_screen_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698