| Index: ash/launcher/launcher_item_delegate_manager.h
|
| diff --git a/ash/launcher/launcher_item_delegate_manager.h b/ash/launcher/launcher_item_delegate_manager.h
|
| index a04e1e0342fcf36c44f7194c3093112702e12f1f..7ae9abb508bde8afeaf86d4fdd9b39fb4a231091 100644
|
| --- a/ash/launcher/launcher_item_delegate_manager.h
|
| +++ b/ash/launcher/launcher_item_delegate_manager.h
|
| @@ -15,7 +15,7 @@
|
|
|
| namespace ash {
|
| class LauncherItemDelegate;
|
| -class LauncherModel;
|
| +class ShelfModel;
|
|
|
| namespace test {
|
| class LauncherItemDelegateManagerTestAPI;
|
| @@ -28,7 +28,7 @@ class LauncherItemDelegateManagerTestAPI;
|
| // LauncherItemDelegates when the corresponding item from the model is removed.
|
| class ASH_EXPORT LauncherItemDelegateManager : public ShelfModelObserver {
|
| public:
|
| - explicit LauncherItemDelegateManager(ash::LauncherModel* model);
|
| + explicit LauncherItemDelegateManager(ShelfModel* model);
|
| virtual ~LauncherItemDelegateManager();
|
|
|
| // Set |item_delegate| for |id| and take an ownership.
|
| @@ -58,7 +58,7 @@ class ASH_EXPORT LauncherItemDelegateManager : public ShelfModelObserver {
|
|
|
| // Clear all exsiting LauncherItemDelegate for test.
|
| // Not owned by LauncherItemDelegate.
|
| - ash::LauncherModel* model_;
|
| + ShelfModel* model_;
|
|
|
| LauncherIDToItemDelegateMap id_to_item_delegate_map_;
|
|
|
|
|