ash: Rename more Launcher classes to Shelf*.

chrome/browser/ui/ash/launcher/launcher_item_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
-#include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_item_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "ui/events/event.h"
 
 class ChromeLauncherController;
 class ChromeLauncherAppMenuItem;
 
 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;
 
 namespace aura {
 class Window;
 }
 
 namespace content {
 class WebContents;
 }
 
 // LauncherItemController is used by ChromeLauncherController to track one
-// or more windows associated with a launcher item.
-class LauncherItemController : public ash::LauncherItemDelegate {
+// or more windows associated with a shelf item.
+class LauncherItemController : public ash::ShelfItemDelegate {
  public:
   enum Type {
     TYPE_APP,
     TYPE_APP_PANEL,
     TYPE_SHORTCUT,
     TYPE_WINDOWED_APP
   };
 
   LauncherItemController(Type type,
                          const std::string& app_id,
@@ skipping 61 matching lines @@
   // applications.
   int locked_;
 
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_