chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type. (Closed)

Patch Set: Update tests; fix test item running status. Created 4 years 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

Download patch

« chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('K') | « 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 5e15505172c23b7f8d34e3e58c78604c033b2034..be80e2d21ce205896f2e12f12e0467365c6b57cc 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

@@ -712,7 +712,6 @@ IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest,

LauncherItemController* item1_controller = GetItemController(item1.id);

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.

TestEvent click_event(ui::ET_MOUSE_PRESSED);

item1_controller->ItemSelected(click_event);