chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2518423003: Combine shelf platform and windowed app types.

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

Issue 2518423003: Combine shelf platform and windowed app types. (Closed)

Patch Set: Fix kInvalidShelfID typo. Created 4 years, 1 month 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/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_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_impl_browsertest.cc

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

index f4f0d6627aad0f104752d00253b47b39a0cab07d..5e15505172c23b7f8d34e3e58c78604c033b2034 100644

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

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

@@ -408,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchUnpinned) {

++item_count;

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item = GetLastLauncherItem();

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);

+ EXPECT_EQ(ash::TYPE_APP, item.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item.status);

CloseAppWindow(window);

--item_count;

@@ -457,7 +457,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, PinRunning) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item1 = GetLastLauncherItem();

ash::ShelfID id = item1.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

// Create a shortcut. The app item should be after it.

@@ -525,7 +525,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, UnpinRunning) {

controller_->Unpin(shortcut_id);

ASSERT_EQ(item_count, shelf_model()->item_count());

item = *shelf_model()->ItemByID(shortcut_id);

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);

+ EXPECT_EQ(ash::TYPE_APP, item.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item.status);

// The item should have moved after the other shortcuts.

EXPECT_GT(shelf_model()->ItemIndexByID(shortcut_id),

@@ -548,7 +548,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleWindows) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item1 = GetLastLauncherItem();

ash::ShelfID item_id = item1.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

EXPECT_EQ(2, GetNumApplicationMenuItems(item1)); // Title + 1 window

@@ -585,7 +585,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleApps) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item1 = GetLastLauncherItem();

ash::ShelfID item_id1 = item1.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

// Then run second app.

@@ -596,7 +596,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleApps) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item2 = GetLastLauncherItem();

ash::ShelfID item_id2 = item2.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item2.type);

+ EXPECT_EQ(ash::TYPE_APP, item2.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item2.status);

EXPECT_NE(item_id1, item_id2);

@@ -627,7 +627,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item1 = GetLastLauncherItem();

ash::ShelfID item_id1 = item1.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

// Then run second app.

@@ -638,7 +638,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, WindowActivation) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item2 = GetLastLauncherItem();

ash::ShelfID item_id2 = item2.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item2.type);

+ EXPECT_EQ(ash::TYPE_APP, item2.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item2.status);

EXPECT_NE(item_id1, item_id2);

@@ -710,7 +710,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest,

// Confirm that a controller item was created and is the correct state.

const ash::ShelfItem& item1 = GetLastLauncherItem();

LauncherItemController* item1_controller = GetItemController(item1.id);

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

EXPECT_EQ(LauncherItemController::TYPE_APP, item1_controller->type());

// Since it is already active, clicking it should minimize.

@@ -847,7 +847,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, BrowserActivation) {

ASSERT_EQ(item_count, shelf_model()->item_count());

const ash::ShelfItem& item1 = GetLastLauncherItem();

ash::ShelfID item_id1 = item1.id;

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

ash::wm::ActivateWindow(browser()->window()->GetNativeWindow());

@@ -1426,7 +1426,7 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest,

ash::ShelfID app_id = item1.id;

int app_index = shelf_model()->ItemIndexByID(app_id);

- EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);

+ EXPECT_EQ(ash::TYPE_APP, item1.type);

EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);

const Extension* extension2 = LoadAndLaunchPlatformApp("launch_2",