| 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 cfb9bb131ecdedb5580a3b760b2b0f693e2614c2..871876a63c0a0f1e424ec9235332af27f72f44d1 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
|
| @@ -95,8 +95,8 @@ class ChromeLauncherControllerImpl
|
| 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;
|
|
|