| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
|
| index 647297c091b0fb6e620f42712cc3920c96747ee5..2cb24997089c287e36d2cd51b3f343267e7ea16c 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
|
| @@ -54,8 +54,8 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {
|
| bool allow_minimize) override;
|
| void ActiveUserChanged(const std::string& user_email) override;
|
| void AdditionalUserAddedToSession(Profile* profile) override;
|
| - ChromeLauncherAppMenuItems GetApplicationList(const ash::ShelfItem& item,
|
| - int event_flags) override;
|
| + ash::ShelfAppMenuItemList GetAppMenuItems(const ash::ShelfItem& item,
|
| + int event_flags) override;
|
| std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
|
| const std::string& app_id) override;
|
| void ActivateShellApp(const std::string& app_id, int window_index) override;
|
|
|