ash: Rename LauncherModelObserver to ShelfModelObserver.

ash/launcher/launcher_item_delegate_manager.h

Index: ash/launcher/launcher_item_delegate_manager.h
diff --git a/ash/launcher/launcher_item_delegate_manager.h b/ash/launcher/launcher_item_delegate_manager.h
index 168a094c7dd1f2dc5b417f01f2d44a2c31fb6e9d..a04e1e0342fcf36c44f7194c3093112702e12f1f 100644
--- a/ash/launcher/launcher_item_delegate_manager.h
+++ b/ash/launcher/launcher_item_delegate_manager.h
@@ -8,8 +8,8 @@
 #include <map>
 
 #include "ash/ash_export.h"
-#include "ash/launcher/launcher_model_observer.h"
 #include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_model_observer.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -26,8 +26,7 @@ class LauncherItemDelegateManagerTestAPI;
 // rather it is expected that someone else invokes SetLauncherItemDelegate
 // appropriately. On the other hand, LauncherItemDelegateManager destroys
 // LauncherItemDelegates when the corresponding item from the model is removed.
-class ASH_EXPORT LauncherItemDelegateManager
-    : public ash::LauncherModelObserver {
+class ASH_EXPORT LauncherItemDelegateManager : public ShelfModelObserver {
  public:
   explicit LauncherItemDelegateManager(ash::LauncherModel* model);
   virtual ~LauncherItemDelegateManager();
@@ -40,14 +39,13 @@ class ASH_EXPORT LauncherItemDelegateManager
   // Returns LauncherItemDelegate for |item_type|. Always returns non-NULL.
   LauncherItemDelegate* GetLauncherItemDelegate(ash::LauncherID id);
 
-  // ash::LauncherModelObserver overrides:
-  virtual void LauncherItemAdded(int model_index) OVERRIDE;
-  virtual void LauncherItemRemoved(int index, ash::LauncherID id) OVERRIDE;
-  virtual void LauncherItemMoved(int start_index, int targetindex) OVERRIDE;
-  virtual void LauncherItemChanged(
-      int index,
-      const ash::LauncherItem& old_item) OVERRIDE;
-  virtual void LauncherStatusChanged() OVERRIDE;
+  // ShelfModelObserver overrides:
+  virtual void ShelfItemAdded(int model_index) OVERRIDE;
+  virtual void ShelfItemRemoved(int index, ash::LauncherID id) OVERRIDE;
+  virtual void ShelfItemMoved(int start_index, int targetindex) OVERRIDE;
+  virtual void ShelfItemChanged(int index,
+                                const LauncherItem& old_item) OVERRIDE;
+  virtual void ShelfStatusChanged() OVERRIDE;
 
  private:
   friend class ash::test::LauncherItemDelegateManagerTestAPI;