Commit 3407712d authored by Manu Cornet's avatar Manu Cornet Committed by Commit Bot

CrOS Shelf: Re-enable disabled test in ShelfLayoutManager

Bug: 660928
Change-Id: I0c720054adb273646e4672ea467702a78c339766
Reviewed-on: https://chromium-review.googlesource.com/c/1454158Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Reviewed-by: default avatarDan Erat <derat@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Auto-Submit: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629178}
parent 25403e47
...@@ -1657,10 +1657,8 @@ TEST_F(ShelfLayoutManagerTest, SetAlignment) { ...@@ -1657,10 +1657,8 @@ TEST_F(ShelfLayoutManagerTest, SetAlignment) {
StatusAreaWidget* status_area_widget = GetShelfWidget()->status_area_widget(); StatusAreaWidget* status_area_widget = GetShelfWidget()->status_area_widget();
gfx::Rect status_bounds(status_area_widget->GetWindowBoundsInScreen()); gfx::Rect status_bounds(status_area_widget->GetWindowBoundsInScreen());
// TODO(estade): Re-enable this check. See crbug.com/660928. EXPECT_GE(status_bounds.width(),
// EXPECT_GE( status_area_widget->GetContentsView()->GetPreferredSize().width());
// status_bounds.width(),
// status_area_widget->GetContentsView()->GetPreferredSize().width());
EXPECT_EQ(layout_manager->GetIdealBounds().width(), EXPECT_EQ(layout_manager->GetIdealBounds().width(),
display.GetWorkAreaInsets().left()); display.GetWorkAreaInsets().left());
EXPECT_EQ(0, display.GetWorkAreaInsets().top()); EXPECT_EQ(0, display.GetWorkAreaInsets().top());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment