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

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/browser_launcher_item_controller_unittest.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

Download patch

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

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

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

index b86860cd684e8b5e9104080a28a66ea391ae6094..a4574461f3516d9f21d49a94c163c2afefe912be 100644

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

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

@@ -37,6 +37,8 @@ class BrowserLauncherItemControllerContentsCreator {

namespace {

+const int kExpectedAppIndex = 2;

// Test implementation of AppTabHelper

class AppTabHelperImpl : public ChromeLauncherController::AppTabHelper {

public:

@@ -327,7 +329,7 @@ TEST_F(BrowserLauncherItemControllerTest, PersistPinned) {

launcher_delegate_->PinAppWithID("1");

EXPECT_GT(app_icon_loader_->GetAndClearFetchCount(), 0);

EXPECT_EQ(ash::TYPE_APP_SHORTCUT,

- launcher_model_->items()[1].type);

+ launcher_model_->items()[kExpectedAppIndex].type);

EXPECT_TRUE(launcher_delegate_->IsAppPinned("1"));

EXPECT_FALSE(launcher_delegate_->IsAppPinned("0"));

EXPECT_EQ(initial_size + 1, launcher_model_->items().size());

@@ -345,7 +347,7 @@ TEST_F(BrowserLauncherItemControllerTest, PersistPinned) {

EXPECT_TRUE(launcher_delegate_->IsAppPinned("1"));

EXPECT_FALSE(launcher_delegate_->IsAppPinned("0"));

EXPECT_EQ(ash::TYPE_APP_SHORTCUT,

- launcher_model_->items()[1].type);

+ launcher_model_->items()[kExpectedAppIndex].type);

UnpinAppsWithID("1");

ASSERT_EQ(initial_size, launcher_model_->items().size());