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

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

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

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 adf549880de98e30533a5b0a7791ce70f7d0751b..f2e7a25df6edb88539165541e67fe60b3c2c81fe 100644

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

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

@@ -14,7 +14,6 @@

#include "ash/root_window_controller.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_model.h"

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

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/wm/window_util.h"

@@ -1080,8 +1079,7 @@ void ChromeLauncherController::ActivateWindowOrMinimizeIfActive(

}

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

- int browser_index =

- ash::GetShelfItemIndexForType(ash::TYPE_BROWSER_SHORTCUT, *model_);

+ int browser_index = model_->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);

DCHECK_GE(browser_index, 0);

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