chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 53513003: ash: Rename GetLauncherItemIndexForType to GetShelfItemIndexForType().

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

Issue 53513003: ash: Rename GetLauncherItemIndexForType to GetShelfItemIndexForType(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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

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

index fb0ab5b0cdc58ba0826591ac816f8ebaf279beb6..737c97dcb20417bf9abae489bac1b99b582a687b 100644

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

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

@@ -8,7 +8,7 @@

#include "ash/launcher/launcher.h"

#include "ash/launcher/launcher_model.h"

-#include "ash/launcher/launcher_model_util.h"

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

#include "ash/shell.h"

#include "ash/wm/window_util.h"

#include "chrome/browser/profiles/profile.h"

@@ -61,7 +61,7 @@ void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {

// Determine the new browser's active state and change if necessary.

int browser_index =

- ash::GetLauncherItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model);

+ ash::GetShelfItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model);

DCHECK_GE(browser_index, 0);

ash::LauncherItem browser_item = model->items()[browser_index];

ash::LauncherItemStatus browser_status = ash::STATUS_CLOSED;

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