Move app list

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 87 matching lines @@
 };
 
 // Test that we can launch a platform app and get a running item.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchUnpinned) {
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
   int item_count = launcher->model()->item_count();
   const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item = launcher->model()->items()[item_count - 1];
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
   CloseShellWindow(window);
   --item_count;
   EXPECT_EQ(item_count, launcher->model()->item_count());
 }
 
 // Test that we can launch a platform app that already has a shortcut.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchPinned) {
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
@@ skipping 33 matching lines @@
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, PinRunning) {
   // Run.
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
   ChromeLauncherController* controller =
       static_cast<ChromeLauncherController*>(launcher->delegate());
   int item_count = launcher->model()->item_count();
   const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item = launcher->model()->items()[item_count - 1];
   ash::LauncherID id = item.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Create a shortcut. The app item should be after it.
   ash::LauncherID foo_id = controller->CreateAppLauncherItem(
       NULL, std::string("foo"), ash::STATUS_CLOSED);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
   EXPECT_LT(launcher->model()->ItemIndexByID(foo_id),
@@ skipping 74 matching lines @@
 // Test that we can launch a platform app with more than one window.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleWindows) {
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
   int item_count = launcher->model()->item_count();
 
   // First run app.
   const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window1 = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item = launcher->model()->items()[item_count - 1];
   ash::LauncherID item_id = item.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Add second window.
   ShellWindow* window2 = CreateShellWindow(extension);
   // Confirm item stays.
   ASSERT_EQ(item_count, launcher->model()->item_count());
   item = *launcher->model()->ItemByID(item_id);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
@@ skipping 14 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleApps) {
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
   int item_count = launcher->model()->item_count();
 
   // First run app.
   const Extension* extension1 = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window1 = CreateShellWindow(extension1);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item1 =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item1 = launcher->model()->items()[item_count - 1];
   ash::LauncherID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   // Then run second app.
   const Extension* extension2 = LoadAndLaunchPlatformApp("launch_2");
   ShellWindow* window2 = CreateShellWindow(extension2);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item2 =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item2 = launcher->model()->items()[item_count - 1];
   ash::LauncherID item_id2 = item2.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item2.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item2.status);
 
   EXPECT_NE(item_id1, item_id2);
   EXPECT_EQ(ash::STATUS_RUNNING, launcher->model()->ItemByID(item_id1)->status);
 
   // Close second app.
   CloseShellWindow(window2);
   --item_count;
@@ skipping 12 matching lines @@
 // the correct activation order is maintained.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
   int item_count = launcher->model()->item_count();
 
   // First run app.
   const Extension* extension1 = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window1 = CreateShellWindow(extension1);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item1 =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item1 = launcher->model()->items()[item_count - 1];
   ash::LauncherID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   // Then run second app.
   const Extension* extension2 = LoadAndLaunchPlatformApp("launch_2");
   ShellWindow* window2 = CreateShellWindow(extension2);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item2 =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item2 = launcher->model()->items()[item_count - 1];
   ash::LauncherID item_id2 = item2.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item2.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item2.status);
 
   EXPECT_NE(item_id1, item_id2);
   EXPECT_EQ(ash::STATUS_RUNNING, launcher->model()->ItemByID(item_id1)->status);
 
   // Activate first one.
   launcher->ActivateLauncherItem(launcher->model()->ItemIndexByID(item_id1));
   EXPECT_EQ(ash::STATUS_ACTIVE, launcher->model()->ItemByID(item_id1)->status);
@@ skipping 51 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, BrowserActivation) {
   ash::Launcher* launcher = ash::Shell::GetInstance()->launcher();
   int item_count = launcher->model()->item_count();
 
   // First run app.
   const Extension* extension1 = LoadAndLaunchPlatformApp("launch");
   CreateShellWindow(extension1);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
-  ash::LauncherItem item1 =
-      launcher->model()->items()[launcher->model()->item_count() - 2];
+  ash::LauncherItem item1 = launcher->model()->items()[item_count - 1];
   ash::LauncherID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   ash::wm::ActivateWindow(browser()->window()->GetNativeWindow());
   EXPECT_EQ(ash::STATUS_RUNNING, launcher->model()->ItemByID(item_id1)->status);
 }
 
 // Test that we can launch an app with a shortcut.
 IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, LaunchPinned) {
@@ skipping 154 matching lines @@
   // Navigate away.
   ui_test_utils::NavigateToURL(
       browser(), GURL("http://www.example.com/path0/bar.html"));
   EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
 
   // Navigate back.
   ui_test_utils::NavigateToURL(
       browser(), GURL("http://www.example.com/path1/foo.html"));
   EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status);
 }