| 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..e992e7756db9b8475986d0599dfaa10a07d342c5 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 GetAppMenuItemsForTest(
 | 
| +      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;
 | 
| 
 |