ash: Add GetItemIndexForType() function to ShelfModel.

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher.h"
 #include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_model_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 31 matching lines @@
 
 void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
   // The shell will not be available for win7_aura unittests like
   // ChromeLauncherControllerTest.BrowserMenuGeneration.
   if (!ash::Shell::HasInstance())
     return;
 
   ash::ShelfModel* model = launcher_controller()->model();
 
   // Determine the new browser's active state and change if necessary.
-  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::LauncherItem browser_item = model->items()[browser_index];
   ash::LauncherItemStatus browser_status = ash::STATUS_CLOSED;
 
   aura::Window* window = ash::wm::GetActiveWindow();
   if (window) {
     // Check if the active browser / tab is a browser which is not an app,
     // a windowed app, a popup or any other item which is not a browser of
     // interest.
     Browser* browser = chrome::FindBrowserWithWindow(window);
@@ skipping 265 matching lines @@
   return (browser &&
           launcher_controller()->IsBrowserFromActiveUser(browser) &&
           browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
           (browser->is_type_tabbed() ||
            !browser->is_app() ||
            !browser->is_type_popup() ||
            launcher_controller()->
                GetLauncherIDForAppID(web_app::GetExtensionIdFromApplicationName(
                    browser->app_name())) <= 0));
 }