Revert 170406 - Align panel icons on the right / end.

ash/launcher/launcher_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/launcher/launcher.h"
@@ skipping 202 matching lines @@
     model_->Add(item);
     return id;
   }
 
   LauncherID AddTabbedBrowser() {
     LauncherID id = AddTabbedBrowserNoWait();
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
-  LauncherID AddPanel() {
-    LauncherID id = AddPanelNoWait();
-    test_api_->RunMessageLoopUntilAnimationsDone();
-    return id;
-  }
-
   LauncherID AddPlatformAppNoWait() {
     LauncherItem item;
     item.type = TYPE_PLATFORM_APP;
     item.status = STATUS_RUNNING;
 
     LauncherID id = model_->next_id();
     model_->Add(item);
     return id;
   }
 
-  LauncherID AddPanelNoWait() {
-    LauncherItem item;
-    item.type = TYPE_APP_PANEL;
-    item.status = STATUS_RUNNING;
-
-    LauncherID id = model_->next_id();
-    model_->Add(item);
-    return id;
-  }
-
   LauncherID AddPlatformApp() {
     LauncherID id = AddPlatformAppNoWait();
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
   void RemoveByID(LauncherID id) {
     model_->RemoveItemAt(model_->ItemIndexByID(id));
     test_api_->RunMessageLoopUntilAnimationsDone();
   }
@@ skipping 83 matching lines @@
 };
 
 // Adds browser button until overflow and verifies that the last added browser
 // button is hidden.
 TEST_F(LauncherViewTest, AddBrowserUntilOverflow) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add tabbed browser until overflow.
-  int items_added = 0;
   LauncherID last_added = AddTabbedBrowser();
   while (!test_api_->IsOverflowButtonVisible()) {
     // Added button is visible after animation while in this loop.
     EXPECT_TRUE(GetButtonByID(last_added)->visible());
 
     last_added = AddTabbedBrowser();
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
   }
 
   // The last added button should be invisible.
   EXPECT_FALSE(GetButtonByID(last_added)->visible());
 }
 
 // Adds one browser button then adds app shortcut until overflow. Verifies that
 // the browser button gets hidden on overflow and last added app shortcut is
 // still visible.
 TEST_F(LauncherViewTest, AddAppShortcutWithBrowserButtonUntilOverflow) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   LauncherID browser_button_id = AddTabbedBrowser();
 
   // Add app shortcut until overflow.
-  int items_added = 0;
   LauncherID last_added = AddAppShortcut();
   while (!test_api_->IsOverflowButtonVisible()) {
     // Added button is visible after animation while in this loop.
     EXPECT_TRUE(GetButtonByID(last_added)->visible());
 
     last_added = AddAppShortcut();
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
   }
 
   // The last added app short button should be visible.
   EXPECT_TRUE(GetButtonByID(last_added)->visible());
   // And the browser button is invisible.
   EXPECT_FALSE(GetButtonByID(browser_button_id)->visible());
 }
 
-TEST_F(LauncherViewTest, AddPanelHidesTabbedBrowser) {
-  ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
-            test_api_->GetButtonCount());
-
-  // Add tabbed browser until overflow, remember last visible tabbed browser.
-  int items_added = 0;
-  LauncherID first_added = AddTabbedBrowser();
-  EXPECT_TRUE(GetButtonByID(first_added)->visible());
-  LauncherID last_visible = first_added;
-  while (true) {
-    LauncherID added = AddTabbedBrowser();
-    if (test_api_->IsOverflowButtonVisible()) {
-      EXPECT_FALSE(GetButtonByID(added)->visible());
-      break;
-    }
-    last_visible = added;
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
-  }
-
-  LauncherID panel = AddPanel();
-  EXPECT_TRUE(GetButtonByID(panel)->visible());
-  EXPECT_FALSE(GetButtonByID(last_visible)->visible());
-
-  RemoveByID(panel);
-  EXPECT_TRUE(GetButtonByID(last_visible)->visible());
-}
-
-TEST_F(LauncherViewTest, PanelsHideLast) {
-  ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
-            test_api_->GetButtonCount());
-
-  // Add tabbed browser.
-  LauncherID browser = AddTabbedBrowser();
-  LauncherID first_panel = AddPanel();
-
-  EXPECT_TRUE(GetButtonByID(browser)->visible());
-  EXPECT_TRUE(GetButtonByID(first_panel)->visible());
-
-  LauncherID last_panel = first_panel;
-  int items_added = 0;
-  while (!test_api_->IsOverflowButtonVisible()) {
-    last_panel = AddPanel();
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
-  }
-
-  EXPECT_TRUE(GetButtonByID(last_panel)->visible());
-  EXPECT_TRUE(GetButtonByID(first_panel)->visible());
-  EXPECT_FALSE(GetButtonByID(browser)->visible());
-}
-
 // Adds button until overflow then removes first added one. Verifies that
 // the last added one changes from invisible to visible and overflow
 // chevron is gone.
 TEST_F(LauncherViewTest, RemoveButtonRevealsOverflowed) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add tabbed browser until overflow.
-  int items_added = 0;
-  LauncherID first_added = AddTabbedBrowser();
+  LauncherID first_added= AddTabbedBrowser();
   LauncherID last_added = first_added;
-  while (!test_api_->IsOverflowButtonVisible()) {
+  while (!test_api_->IsOverflowButtonVisible())
     last_added = AddTabbedBrowser();
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
-  }
 
   // Expect add more than 1 button. First added is visible and last is not.
   EXPECT_NE(first_added, last_added);
   EXPECT_TRUE(GetButtonByID(first_added)->visible());
   EXPECT_FALSE(GetButtonByID(last_added)->visible());
 
   // Remove first added.
   RemoveByID(first_added);
 
   // Last added button becomes visible and overflow chevron is gone.
   EXPECT_TRUE(GetButtonByID(last_added)->visible());
   EXPECT_EQ(1.0f, GetButtonByID(last_added)->layer()->opacity());
   EXPECT_FALSE(test_api_->IsOverflowButtonVisible());
 }
 
 // Verifies that remove last overflowed button should hide overflow chevron.
 TEST_F(LauncherViewTest, RemoveLastOverflowed) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add tabbed browser until overflow.
-  int items_added = 0;
-  LauncherID last_added = AddTabbedBrowser();
-  while (!test_api_->IsOverflowButtonVisible()) {
+  LauncherID last_added= AddTabbedBrowser();
+  while (!test_api_->IsOverflowButtonVisible())
     last_added = AddTabbedBrowser();
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
-  }
 
   RemoveByID(last_added);
   EXPECT_FALSE(test_api_->IsOverflowButtonVisible());
 }
 
 // Adds browser button without waiting for animation to finish and verifies
 // that all added buttons are visible.
 TEST_F(LauncherViewTest, AddButtonQuickly) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add a few tabbed browser quickly without wait for animation.
   int added_count = 0;
   while (!test_api_->IsOverflowButtonVisible()) {
     AddTabbedBrowserNoWait();
     ++added_count;
-    ASSERT_LT(added_count, 10000);
   }
 
   // LauncherView should be big enough to hold at least 3 new buttons.
   ASSERT_GE(added_count, 3);
 
   // Wait for the last animation to finish.
   test_api_->RunMessageLoopUntilAnimationsDone();
 
   // Verifies non-overflow buttons are visible.
   for (int i = 0; i <= test_api_->GetLastVisibleIndex(); ++i) {
@@ skipping 257 matching lines @@
 // Resizing launcher view while an add animation without fade-in is running,
 // which happens when overflow happens. App list button should end up in its
 // new ideal bounds.
 TEST_F(LauncherViewTest, ResizeDuringOverflowAddAnimation) {
   // All buttons should be visible.
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());
 
   // Add buttons until overflow. Let the non-overflow add animations finish but
   // leave the last running.
-  int items_added = 0;
   AddTabbedBrowserNoWait();
   while (!test_api_->IsOverflowButtonVisible()) {
     test_api_->RunMessageLoopUntilAnimationsDone();
     AddTabbedBrowserNoWait();
-    ++items_added;
-    ASSERT_LT(items_added, 10000);
   }
 
   // Resize launcher view with that animation running and stay overflown.
   gfx::Rect bounds = launcher_view_->bounds();
   bounds.set_width(bounds.width() - kLauncherPreferredSize);
   launcher_view_->SetBoundsRect(bounds);
   ASSERT_TRUE(test_api_->IsOverflowButtonVisible());
 
   // Finish the animation.
   test_api_->RunMessageLoopUntilAnimationsDone();
 
   // App list button should ends up in its new ideal bounds.
   const int app_list_button_index = test_api_->GetButtonCount() - 1;
   const gfx::Rect& app_list_ideal_bounds =
       test_api_->GetIdealBoundsByIndex(app_list_button_index);
   const gfx::Rect& app_list_bounds =
       test_api_->GetBoundsByIndex(app_list_button_index);
   EXPECT_EQ(app_list_bounds, app_list_ideal_bounds);
 }
 
 }  // namespace test
 }  // namespace ash