ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "ash/ash_switches.h"
@@ skipping 113 matching lines @@
     return ash::test::ShellTestApi(ash::Shell::GetInstance()).launcher_model();
   }
 
   ash::LauncherID CreateAppShortcutLauncherItem(const std::string& name) {
     return controller_->CreateAppShortcutLauncherItem(
         name, controller_->model()->item_count());
   }
 
   const ash::LauncherItem& GetLastLauncherItem() {
     // Unless there are any panels, the item at index [count - 1] will be
-    // the app list, and the item at [count - 2] will be the desired item.
-    return launcher_model()->items()[launcher_model()->item_count() - 2];
+    // the desired item.
+    return launcher_model()->items()[launcher_model()->item_count() - 1];
   }
 
   const ash::LauncherItem& GetLastLauncherPanelItem() {
     // Panels show up on the right side of the launcher, so the desired item
     // will be the last one.
     return launcher_model()->items()[launcher_model()->item_count() - 1];
   }
 
   LauncherItemController* GetItemController(ash::LauncherID id) {
     return controller_->id_to_item_controller_map_[id];
@@ skipping 663 matching lines @@
   // processed it. This needs to be in a loop since the renderer runs in a
   // different process.
   while (test_observer.icon_updates() < 3) {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
 
   // This test creates one shell window and one panel window.
   int launcher_item_count = launcher_model()->item_count();
   ASSERT_EQ(base_launcher_item_count + 2, launcher_item_count);
-  // The Panel will be the last item, the app list second-to-last, the app
-  // third from last.
+  // The Panel will be the last item, the app second-to-last.
   const ash::LauncherItem& app_item =
-      launcher_model()->items()[launcher_item_count - 3];
+      launcher_model()->items()[launcher_item_count - 2];
   const ash::LauncherItem& panel_item =
       launcher_model()->items()[launcher_item_count - 1];
   const LauncherItemController* app_item_controller =
       GetItemController(app_item.id);
   const LauncherItemController* panel_item_controller =
       GetItemController(panel_item.id);
   // Icons for Apps are set by the ShellWindowLauncherController, so
   // image_set_by_controller() should be set.
   EXPECT_TRUE(app_item_controller->image_set_by_controller());
   EXPECT_TRUE(panel_item_controller->image_set_by_controller());
@@ skipping 537 matching lines @@
   // Active windows don't show attention.
   panel->GetNativeWindow()->SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 }
 
 // Checks that the browser Alt "tabbing" is properly done.
 IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTestNoDefaultBrowser,
     AltNumberBrowserTabbing) {
   // Get the number of items in the browser menu.
   EXPECT_EQ(0u, chrome::GetTotalBrowserCount());
-  // The first activation should create a browser.
-  launcher_->ActivateLauncherItem(0);
+  // The first activation should create a browser at index 1 (App List @ 0).
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   // A second activation should not create a new instance.
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   Browser* browser1 = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
   EXPECT_TRUE(browser1);
   aura::Window* window1 = browser1->window()->GetNativeWindow();
   Browser* browser2 = CreateBrowser(profile());
   aura::Window* window2 = browser2->window()->GetNativeWindow();
 
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
   EXPECT_NE(window1, window2);
   EXPECT_EQ(window2, ash::wm::GetActiveWindow());
 
   // Activate multiple times the switcher to see that the windows get activated.
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window1, ash::wm::GetActiveWindow());
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window2, ash::wm::GetActiveWindow());
 
   // Create a third browser - make sure that we do not toggle simply between
   // two windows.
   Browser* browser3 = CreateBrowser(profile());
   aura::Window* window3 = browser3->window()->GetNativeWindow();
 
   EXPECT_EQ(3u, chrome::GetTotalBrowserCount());
   EXPECT_NE(window1, window3);
   EXPECT_NE(window2, window3);
   EXPECT_EQ(window3, ash::wm::GetActiveWindow());
 
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window1, ash::wm::GetActiveWindow());
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window2, ash::wm::GetActiveWindow());
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window3, ash::wm::GetActiveWindow());
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window1, ash::wm::GetActiveWindow());
 
   // Create anther app and make sure that none of our browsers is active.
   LoadAndLaunchExtension("app1", extension_misc::LAUNCH_TAB, NEW_WINDOW);
   EXPECT_NE(window1, ash::wm::GetActiveWindow());
   EXPECT_NE(window2, ash::wm::GetActiveWindow());
 
   // After activation our browser should be active again.
-  launcher_->ActivateLauncherItem(0);
+  launcher_->ActivateLauncherItem(1);
   EXPECT_EQ(window1, ash::wm::GetActiveWindow());
 }
 
 // Checks that after a session restore, we do not start applications on an
 // activation.
 IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, ActivateAfterSessionRestore) {
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
   // Create a known application.
   ash::LauncherID shortcut_id = CreateShortcut("app1");
@@ skipping 338 matching lines @@
   // Now show overflow bubble.
   test.ShowOverflowBubble();
   EXPECT_TRUE(launcher_->IsShowingOverflowBubble());
 
   // Unpin first pinned app and there should be no crash.
   controller_->UnpinAppWithID(std::string("fake_app_0"));
 
   test.RunMessageLoopUntilAnimationsDone();
   EXPECT_FALSE(launcher_->IsShowingOverflowBubble());
 }