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 2cb24997089c287e36d2cd51b3f343267e7ea16c..9f1f24857e3e4385727cacfa66f50d6bae2148bc 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h |
@@ -40,7 +40,7 @@ class ChromeLauncherControllerMus : public ChromeLauncherController { |
bool IsOpen(ash::ShelfID id) override; |
bool IsPlatformApp(ash::ShelfID id) override; |
void ActivateApp(const std::string& app_id, |
- ash::LaunchSource source, |
+ ash::ShelfLaunchSource source, |
int event_flags) override; |
void SetLauncherItemImage(ash::ShelfID shelf_id, |
const gfx::ImageSkia& image) override; |
@@ -49,7 +49,7 @@ class ChromeLauncherControllerMus : public ChromeLauncherController { |
ash::ShelfID GetShelfIDForWebContents( |
content::WebContents* contents) override; |
void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; |
- ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( |
+ ash::ShelfAction ActivateWindowOrMinimizeIfActive( |
ui::BaseWindow* window, |
bool allow_minimize) override; |
void ActiveUserChanged(const std::string& user_email) override; |