chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 10905201: Move app list

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 10905201: Move app list (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review issues Created 8 years, 3 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

index 5603bd56dc6c61d83d18e998f72ed86a925f9517..ca616323ac1b98099278a79626c016b160560c55 100644

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

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

@@ -105,8 +105,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchUnpinned) {

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);

@@ -160,8 +159,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, PinRunning) {

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);

@@ -256,8 +254,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleWindows) {

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);

@@ -292,8 +289,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleApps) {

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);

@@ -303,8 +299,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleApps) {

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);

@@ -337,8 +332,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {

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);

@@ -348,8 +342,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {

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);

@@ -421,8 +414,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, BrowserActivation) {

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);