| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
| index 09a9302151627342c67387a70e0379733cb3986e..20e596ca59400f303bcb724377740f75d1420506 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
| @@ -70,8 +70,8 @@ class ChromeLauncherControllerImpl
|
| LauncherItemController* controller) override;
|
| void CloseLauncherItem(ash::ShelfID id) override;
|
| bool IsPinned(ash::ShelfID id) override;
|
| - void LockV1AppWithID(const std::string& app_id) override;
|
| - void UnlockV1AppWithID(const std::string& app_id) override;
|
| + void SetV1AppStatus(const std::string& app_id,
|
| + ash::ShelfItemStatus status) override;
|
| void Launch(ash::ShelfID id, int event_flags) override;
|
| void Close(ash::ShelfID id) override;
|
| bool IsOpen(ash::ShelfID id) override;
|
| @@ -148,7 +148,6 @@ class ChromeLauncherControllerImpl
|
| void OnInit() override;
|
|
|
| // Creates a new app shortcut item and controller on the shelf at |index|.
|
| - // Use kInsertItemAtEnd to add a shortcut as the last item.
|
| ash::ShelfID CreateAppShortcutLauncherItem(
|
| const ash::AppLaunchId& app_launch_id,
|
| int index);
|
| @@ -169,13 +168,6 @@ class ChromeLauncherControllerImpl
|
| void RememberUnpinnedRunningApplicationOrder();
|
| void RestoreUnpinnedRunningApplicationOrder(const std::string& user_id);
|
|
|
| - // Creates a new app shortcut item and controller on the shelf at |index|.
|
| - // Use kInsertItemAtEnd to add a shortcut as the last item.
|
| - ash::ShelfID CreateAppShortcutLauncherItemWithType(
|
| - const ash::AppLaunchId& app_launch_id,
|
| - int index,
|
| - ash::ShelfItemType shelf_item_type);
|
| -
|
| // Invoked when the associated browser or app is closed.
|
| void LauncherItemClosed(ash::ShelfID id);
|
|
|
|
|