chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 27369004: Change GetBrowserItemIndex() to GetLauncherItemIndexForType()

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 27369004: Change GetBrowserItemIndex() to GetLauncherItemIndexForType() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move to launcher_model_util 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 84128775261c9b74cb2003b9db5023b26a684b95..fbee10975e773d2ed347e1bd01adf1f4499c62d9 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/shelf/shelf_util.h"

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

#include "ash/shell.h"

#include "ash/wm/window_util.h"

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

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

ash::LauncherModel* model = launcher_controller()->model();

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

- size_t browser_index = ash::GetBrowserItemIndex(*model);

+ size_t browser_index =

sky 2013/10/23 13:26:10 This should be an int.

simonhong_ 2013/10/23 14:05:24 Done. Thank you!

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

DCHECK_GE(browser_index, 0u);

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

ash::LauncherItemStatus browser_status = ash::STATUS_CLOSED;

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