ash: Rename LauncherIconObserver to ShelfIconObserver.

ash/launcher/launcher.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 ASH_LAUNCHER_LAUNCHER_H_
 #define ASH_LAUNCHER_LAUNCHER_H_
 
 #include "ash/ash_export.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shelf/shelf_types.h"
@@ skipping 23 matching lines @@
 namespace internal {
 class FocusCycler;
 class ShelfLayoutManager;
 class ShelfView;
 }
 
 namespace test {
 class LauncherTestAPI;
 }
 
-class LauncherIconObserver;
 class LauncherDelegate;
 class LauncherModel;
+class ShelfIconObserver;
 class ShelfWidget;
 
 class ASH_EXPORT Launcher {
  public:
   static const char kNativeViewName[];
 
   Launcher(LauncherModel* launcher_model,
            LauncherDelegate* launcher_delegate,
            ShelfWidget* shelf_widget);
   virtual ~Launcher();
@@ skipping 18 matching lines @@
   // when dragging panels to reposition them with respect to the other panels.
   void UpdateIconPositionForWindow(aura::Window* window);
 
   // Activates the the launcher item specified by the index in the list
   // of launcher items.
   void ActivateLauncherItem(int index);
 
   // Cycles the window focus linearly over the current launcher items.
   void CycleWindowLinear(CycleDirection direction);
 
-  void AddIconObserver(LauncherIconObserver* observer);
-  void RemoveIconObserver(LauncherIconObserver* observer);
+  void AddIconObserver(ShelfIconObserver* observer);
+  void RemoveIconObserver(ShelfIconObserver* observer);
 
   // Returns true if the Launcher is showing a context menu.
   bool IsShowingMenu() const;
 
   bool IsShowingOverflowBubble() const;
 
   void SetVisible(bool visible) const;
   bool IsVisible() const;
 
   void SchedulePaint();
@@ skipping 28 matching lines @@
   LauncherDelegate* delegate_;
 
   ShelfWidget* shelf_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(Launcher);
 };
 
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_H_