ash: Add GetItemIndexForType() function to ShelfModel.

ash: Add GetItemIndexForType() function to ShelfModel.

Now that this function is generic enough, there is no reason to not
provide it directly from ShelfModel.

See previous CLs:
https://codereview.chromium.org/27369004
https://codereview.chromium.org/53513003
https://codereview.chromium.org/71653003

BUG=None
TEST=None, no functional changes
R=jamescook@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=235641

[tfarina, 2013-11-15 14:00:53]

Hi James, could you review this to me?

Thanks!

[James Cook, 2013-11-15 20:38:19]

LGTM. Thanks for cleaning this up -- it's a good day when a file is deleted.

[simonhong_, 2013-11-15 23:36:27]

lgtm with nit.

https://codereview.chromium.org/68523017/diff/160001/chrome/browser/ui/ash/la...
File chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
(right):

https://codereview.chromium.org/68523017/diff/160001/chrome/browser/ui/ash/la...
chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc:270:
return model->GetItemIndexForType(type);
nit: model -> model_

[commit-bot: I haz the power, 2013-11-16 11:53:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/68523017/230001

[commit-bot: I haz the power, 2013-11-16 11:54:03]

Failed to apply patch for
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
  Hunk #1 FAILED at 8.
  Hunk #2 succeeded at 61 (offset 1 line).
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc.rej

Patch:      
chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
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
3c3a2ae0393a09a83d831a9d627c33e8c7b24d08..a14767ed46b4b96f909ffc919724574fd5dfc070
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,6 @@
 
 #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"
@@ -60,8 +59,7 @@ void
BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
   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;

[commit-bot: I haz the power, 2013-11-16 12:19:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/68523017/320001

[commit-bot: I haz the power, 2013-11-18 06:16:15]

Change committed as 235641