| Index: ash/shelf/shelf_view.h
|
| diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
|
| index db298f0daa285604e1d2d7a45d28c4f10327188a..1333586b9771cad274882e672fe0ca508b7d3e66 100644
|
| --- a/ash/shelf/shelf_view.h
|
| +++ b/ash/shelf/shelf_view.h
|
| @@ -34,9 +34,9 @@ class ShelfViewTestAPI;
|
|
|
| class LauncherDelegate;
|
| struct LauncherItem;
|
| -class LauncherIconObserver;
|
| class LauncherItemDelegateManager;
|
| class LauncherModel;
|
| +class ShelfIconObserver;
|
|
|
| namespace internal {
|
|
|
| @@ -79,8 +79,8 @@ class ASH_EXPORT ShelfView : public views::View,
|
| // Repositions the icon for the specified item by the midpoint of the window.
|
| void UpdatePanelIconPosition(LauncherID id, const gfx::Point& midpoint);
|
|
|
| - void AddIconObserver(LauncherIconObserver* observer);
|
| - void RemoveIconObserver(LauncherIconObserver* observer);
|
| + void AddIconObserver(ShelfIconObserver* observer);
|
| + void RemoveIconObserver(ShelfIconObserver* observer);
|
|
|
| // Returns true if we're showing a menu.
|
| bool IsShowingMenu() const;
|
| @@ -356,7 +356,7 @@ class ASH_EXPORT ShelfView : public views::View,
|
|
|
| scoped_ptr<views::MenuRunner> launcher_menu_runner_;
|
|
|
| - ObserverList<LauncherIconObserver> observers_;
|
| + ObserverList<ShelfIconObserver> observers_;
|
|
|
| // Amount content is inset on the left edge (or top edge for vertical
|
| // alignment).
|
|
|