Renames LauncherID, LauncherItem and LauncherItems...

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

Index: chrome/browser/ui/ash/launcher/launcher_context_menu.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index a3e4ece82cf23794a22a0d9f3636b4f450b7e5f9..f2d29f6e6112cc22fbec59734b569334a9e87a77 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
 
-#include "ash/launcher/launcher_types.h"
 #include "ash/shelf/shelf_alignment_menu.h"
+#include "ash/shelf/shelf_item_types.h"
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -33,13 +33,13 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
   // |item| is NULL if the context menu is for the launcher (the user right
   // |clicked on an area with no icons).
   LauncherContextMenu(ChromeLauncherController* controller,
-                      const ash::LauncherItem* item,
+                      const ash::ShelfItem* item,
                       aura::Window* root_window);
 
   // Creates a menu used by item created by ShelfWindowWatcher.
   LauncherContextMenu(ChromeLauncherController* controller,
                       ash::ShelfItemDelegate* item_delegate,
-                      ash::LauncherItem* item,
+                      ash::ShelfItem* item,
                       aura::Window* root_window);
 
   // Creates a menu used as a desktop context menu on |root_window|.
@@ -50,7 +50,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
   void Init();
 
   // ID of the item we're showing the context menu for.
-  ash::LauncherID id() const { return item_.id; }
+  ash::ShelfID id() const { return item_.id; }
 
   // ui::SimpleMenuModel::Delegate overrides:
   virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
@@ -93,7 +93,7 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
 
   ChromeLauncherController* controller_;
 
-  ash::LauncherItem item_;
+  ash::ShelfItem item_;
 
   ash::ShelfAlignmentMenu shelf_alignment_menu_;