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: fix clang error 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

« no previous file with comments | « 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 5bca6e22ab9a07a8e666241b76ead5b3c5d4fe7a..0e934f0e389e1061ed2c3c707597090b0aeb6fc9 100644

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

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

@@ -11,9 +11,9 @@

#include "ash/launcher/launcher.h"

#include "ash/launcher/launcher_item_delegate_manager.h"

#include "ash/launcher/launcher_model.h"

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

#include "ash/root_window_controller.h"

#include "ash/shelf/shelf_layout_manager.h"

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

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/wm/window_util.h"

@@ -962,7 +962,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;