ash: Rename LauncherIconObserver to ShelfIconObserver.

ash/wm/app_list_controller.h

Index: ash/wm/app_list_controller.h
diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h
index 0fc20b5a1c42b404b7ba5e346f61a3465b63493c..2e4175839ed18c7b14f1ff993532383b992d17f5 100644
--- a/ash/wm/app_list_controller.h
+++ b/ash/wm/app_list_controller.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_
 #define ASH_WM_APP_LIST_CONTROLLER_H_
 
-#include "ash/launcher/launcher_icon_observer.h"
+#include "ash/shelf/shelf_icon_observer.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -45,7 +45,7 @@ class AppListController : public ui::EventHandler,
                           public ui::ImplicitAnimationObserver,
                           public views::WidgetObserver,
                           public ShellObserver,
-                          public LauncherIconObserver,
+                          public ShelfIconObserver,
                           public app_list::PaginationModelObserver {
  public:
   AppListController();
@@ -113,8 +113,8 @@ class AppListController : public ui::EventHandler,
   // ShellObserver overrides:
   virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE;
 
-  // LauncherIconObserver overrides:
-  virtual void OnLauncherIconPositionsChanged() OVERRIDE;
+  // ShelfIconObserver overrides:
+  virtual void OnShelfIconPositionsChanged() OVERRIDE;
 
   // app_list::PaginationModelObserver overrides:
   virtual void TotalPagesChanged() OVERRIDE;