chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 68523017: ash: Add GetItemIndexForType() function to ShelfModel.

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_browsertest.cc

Issue 68523017: ash: Add GetItemIndexForType() function to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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

Download patch

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 9ef00d69a28a4b1635340bfad1b3992447cb42d5..4e2c3913623877658ea75ee08bc92cd191dca6a2 100644

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

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

@@ -12,7 +12,6 @@

#include "ash/launcher/launcher.h"

#include "ash/launcher/launcher_button.h"

#include "ash/shelf/shelf_model.h"

-#include "ash/shelf/shelf_model_util.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shelf/shelf_view.h"

#include "ash/shell.h"

@@ -269,7 +268,7 @@ class LauncherAppBrowserTest : public ExtensionBrowserTest {

// Get the index of an item which has the given type.

int GetIndexOfShelfItemType(ash::LauncherItemType type) {

- return ash::GetShelfItemIndexForType(type, *model_);

+ return model_->GetItemIndexForType(type);

}

// Try to rip off |item_index|.

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | no next file » | no next file with comments »