chrome/browser/ui/ash/launcher/chrome_launcher_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/chrome_launcher_controller.cc

Issue 27369004: Change GetBrowserItemIndex() to GetLauncherItemIndexForType() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« ash/shelf/shelf_util.cc ('K') | « chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.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/chrome_launcher_controller.cc

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

index 4b7937b0f1189c5fc2bbf92b708f387abed7c5ad..917fed9453292d70fcbde3835f2875fe5769da60 100644

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

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

@@ -957,7 +957,8 @@ void ChromeLauncherController::ActivateWindowOrMinimizeIfActive(

}

ash::LauncherID ChromeLauncherController::GetIDByWindow(aura::Window* window) {

- int browser_index = ash::GetBrowserItemIndex(*model_);

+ int browser_index =

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

DCHECK_GE(browser_index, 0);

ash::LauncherID browser_id = model_->items()[browser_index].id;