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

Unified Diff: ash/wm/panels/panel_layout_manager_unittest.cc

Issue 17673004: Insert panel icons on the left of other panel icons. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix test assertions. Created 7 years, 6 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
Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index b152b9e9e767d7a8c2344cb0dcf0c22295a2f8e4..d5e3baf88c647ca1a7696e0589b9f07513552544 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -516,9 +516,9 @@ TEST_F(PanelLayoutManagerTest, FanWindows) {
Launcher* launcher = Launcher::ForPrimaryDisplay();
int icon_x1 = launcher->GetScreenBoundsOfItemIconForWindow(w1.get()).x();
int icon_x2 = launcher->GetScreenBoundsOfItemIconForWindow(w2.get()).x();
- EXPECT_EQ(window_x2 - window_x1, window_x3 - window_x2);
- int spacing = window_x2 - window_x1;
- EXPECT_GT(spacing, icon_x2 - icon_x1);
+ EXPECT_EQ(window_x1 - window_x2, window_x2 - window_x3);
+ int spacing = window_x1 - window_x2;
+ EXPECT_GT(spacing, icon_x1 - icon_x2);
}
TEST_F(PanelLayoutManagerTest, FanLargeWindow) {
@@ -534,8 +534,8 @@ TEST_F(PanelLayoutManagerTest, FanLargeWindow) {
int window_x3 = w3->GetBoundsInRootWindow().CenterPoint().x();
// The distances may not be equidistant with a large panel but the panels
// should be in the correct order with respect to their midpoints.
- EXPECT_GT(window_x2, window_x1);
- EXPECT_GT(window_x3, window_x2);
+ EXPECT_GT(window_x1, window_x2);
+ EXPECT_GT(window_x2, window_x3);
}
TEST_F(PanelLayoutManagerTest, MinimizeRestorePanel) {

Powered by Google App Engine
This is Rietveld 408576698