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 1a732720c3329448d62c69d304eb58429922ef88..148f314154c8b9013e7cd3100c8a5ac602e13356 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h |
@@ -81,7 +81,7 @@ class ChromeLauncherControllerImpl |
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; |
@@ -90,7 +90,7 @@ class ChromeLauncherControllerImpl |
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; |