| 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 9f1f24857e3e4385727cacfa66f50d6bae2148bc..c36de2bdc6b73074a3bb943a5e4d6bec4b745aa0 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;
|
| - ash::ShelfAppMenuItemList GetAppMenuItems(const ash::ShelfItem& item,
|
| - int event_flags) override;
|
| + ash::ShelfAppMenuItemList GetAppMenuItemsForTesting(
|
| + const ash::ShelfItem& item) override;
|
| std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
|
| const std::string& app_id) override;
|
| void ActivateShellApp(const std::string& app_id, int window_index) override;
|
|
|