ash: Rename LauncherIconObserver to ShelfIconObserver.

ash/wm/app_list_controller.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_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"
 #include "base/timer/timer.h"
 #include "ui/app_list/pagination_model_observer.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/rect.h"
@@ skipping 19 matching lines @@
 // AppListController is a controller that manages app list UI for shell.
 // It creates AppListView and schedules showing/hiding animation.
 // While the UI is visible, it monitors things such as app list widget's
 // activation state and desktop mouse click to auto dismiss the UI.
 class AppListController : public ui::EventHandler,
                           public aura::client::FocusChangeObserver,
                           public aura::WindowObserver,
                           public ui::ImplicitAnimationObserver,
                           public views::WidgetObserver,
                           public ShellObserver,
-                          public LauncherIconObserver,
+                          public ShelfIconObserver,
                           public app_list::PaginationModelObserver {
  public:
   AppListController();
   virtual ~AppListController();
 
   // Show/hide app list window. The |window| is used to deterime in
   // which display (in which the |window| exists) the app list should
   // be shown.
   void SetVisible(bool visible, aura::Window* window);
 
@@ skipping 47 matching lines @@
 
   // ui::ImplicitAnimationObserver overrides:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE;
 
   // views::WidgetObserver overrides:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
 
   // 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;
   virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE;
   virtual void TransitionStarted() OVERRIDE;
   virtual void TransitionChanged() OVERRIDE;
 
   scoped_ptr<app_list::PaginationModel> pagination_model_;
 
   // Whether we should show or hide app list widget.
   bool is_visible_;
 
   // The AppListView this class manages, owned by its widget.
   app_list::AppListView* view_;
 
   // Cached bounds of |view_| for snapping back animation after over-scroll.
   gfx::Rect view_bounds_;
 
   // Whether should schedule snap back animation.
   bool should_snap_back_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_APP_LIST_CONTROLLER_H_