| 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..2ee9a09d9f3feb6a5f21a501206afce10a89aa5d 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,8 +60,9 @@ 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);
|
| - DCHECK_GE(browser_index, 0u);
|
| + int browser_index =
|
| + ash::GetLauncherItemIndexForType(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;
|
|
|
|
|