| 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 148f314154c8b9013e7cd3100c8a5ac602e13356..037a222158609db06ef4b07d86b80c8cd2e2ecce 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;
|
| - 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;
|
|
|