ash: Rename LauncherModel to ShelfModel.

ash/shelf/shelf_navigator.cc

 // Copyright 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 "ash/shelf/shelf_navigator.h"
 
-#include "ash/launcher/launcher_model.h"
+#include "ash/shelf/shelf_model.h"
 
 namespace ash {
 
 namespace {
 
 // Returns true if accelerator processing should skip the launcher item with
 // the specified type.
 bool ShouldSkip(ash::LauncherItemType type) {
   return type == ash::TYPE_APP_LIST ||
          type == ash::TYPE_BROWSER_SHORTCUT ||
          type == ash::TYPE_APP_SHORTCUT ||
          type == ash::TYPE_WINDOWED_APP;
 }
 
 }  // namespace
 
-int GetNextActivatedItemIndex(const LauncherModel& model,
+int GetNextActivatedItemIndex(const ShelfModel& model,
                               CycleDirection direction) {
   const ash::LauncherItems& items = model.items();
   int item_count = model.item_count();
   int current_index = -1;
   int first_running = -1;
 
   for (int i = 0; i < item_count; ++i) {
     const ash::LauncherItem& item = items[i];
     if (ShouldSkip(item.type))
       continue;
@@ skipping 28 matching lines @@
     if (item.status == ash::STATUS_ACTIVE)
       continue;
 
     return i;
   }
 
   return -1;
 }
 
 }  // namespace ash