| Index: ash/launcher/launcher_model.h
|
| diff --git a/ash/launcher/launcher_model.h b/ash/launcher/launcher_model.h
|
| index 9d428445649749d0b94f76543cf6c2f5337faf5c..2845fb0df877176b82a709190873c6e4a322e895 100644
|
| --- a/ash/launcher/launcher_model.h
|
| +++ b/ash/launcher/launcher_model.h
|
| @@ -12,7 +12,7 @@
|
|
|
| namespace ash {
|
|
|
| -class LauncherModelObserver;
|
| +class ShelfModelObserver;
|
|
|
| // Model used by ShelfView.
|
| class ASH_EXPORT LauncherModel {
|
| @@ -67,8 +67,8 @@ class ASH_EXPORT LauncherModel {
|
| void SetStatus(Status status);
|
| Status status() const { return status_; }
|
|
|
| - void AddObserver(LauncherModelObserver* observer);
|
| - void RemoveObserver(LauncherModelObserver* observer);
|
| + void AddObserver(ShelfModelObserver* observer);
|
| + void RemoveObserver(ShelfModelObserver* observer);
|
|
|
| private:
|
| // Makes sure |index| is in line with the type-based order of items. If that
|
| @@ -81,7 +81,7 @@ class ASH_EXPORT LauncherModel {
|
|
|
| LauncherItems items_;
|
| Status status_;
|
| - ObserverList<LauncherModelObserver> observers_;
|
| + ObserverList<ShelfModelObserver> observers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LauncherModel);
|
| };
|
|
|