Renames LauncherID, LauncherItem and LauncherItems...

ash/shelf/shelf_model_observer.h

Index: ash/shelf/shelf_model_observer.h
diff --git a/ash/shelf/shelf_model_observer.h b/ash/shelf/shelf_model_observer.h
index 6d9f21fd2ff721a20b7b9fb946eb78269cd90035..a65e5cfea738e5ccd5de6fae493d66646bfd5ef2 100644
--- a/ash/shelf/shelf_model_observer.h
+++ b/ash/shelf/shelf_model_observer.h
@@ -6,11 +6,11 @@
 #define ASH_SHELF_SHELF_MODEL_OBSERVER_H_
 
 #include "ash/ash_export.h"
-#include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_item_types.h"
 
 namespace ash {
 
-struct LauncherItem;
+struct ShelfItem;
 
 class ASH_EXPORT ShelfModelObserver {
  public:
@@ -19,7 +19,7 @@ class ASH_EXPORT ShelfModelObserver {
 
   // Invoked after an item has been removed. |index| is the index the item was
   // at.
-  virtual void ShelfItemRemoved(int index, LauncherID id) = 0;
+  virtual void ShelfItemRemoved(int index, ShelfID id) = 0;
 
   // Invoked after an item has been moved. See ShelfModel::Move() for details
   // of the arguments.
@@ -27,7 +27,7 @@ class ASH_EXPORT ShelfModelObserver {
 
   // Invoked when the state of an item changes. |old_item| is the item
   // before the change.
-  virtual void ShelfItemChanged(int index, const LauncherItem& old_item) = 0;
+  virtual void ShelfItemChanged(int index, const ShelfItem& old_item) = 0;
 
   // Invoked when shelf status is changed.
   virtual void ShelfStatusChanged() = 0;