Renames LauncherID, LauncherItem and LauncherItems...

chrome/browser/ui/ash/launcher/launcher_context_menu.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_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"
 #include "ui/base/models/simple_menu_model.h"
 
 class ChromeLauncherController;
 
 namespace ash {
 class ShelfItemDelegate;
 }
 
 namespace aura {
 class Window;
 }
 
 namespace extensions {
 class ContextMenuMatcher;
 }
 
 // Context menu shown for a launcher item.
 class LauncherContextMenu : public ui::SimpleMenuModel,
                             public ui::SimpleMenuModel::Delegate {
  public:
   // |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|.
   LauncherContextMenu(ChromeLauncherController* controller,
                       aura::Window* root_window);
   virtual ~LauncherContextMenu();
 
   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;
   virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
@@ skipping 22 matching lines @@
     MENU_CHANGE_WALLPAPER,
 #endif
   };
 
   // Does |item_| represent a valid item? See description of constructor for
   // details on why it may not be valid.
   bool is_valid_item() const { return item_.id != 0; }
 
   ChromeLauncherController* controller_;
 
-  ash::LauncherItem item_;
+  ash::ShelfItem item_;
 
   ash::ShelfAlignmentMenu shelf_alignment_menu_;
 
   scoped_ptr<extensions::ContextMenuMatcher> extension_items_;
 
   aura::Window* root_window_;
 
   // Not owned.
   ash::ShelfItemDelegate* item_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenu);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_