Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc |
index fa664f9a29920d33a5fe942b8a5486554e853442..8896255517a7260805881d9750aa5b7b2129bae9 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc |
@@ -138,7 +138,7 @@ bool ChromeLauncherControllerMus::IsPlatformApp(ash::ShelfID id) { |
} |
void ChromeLauncherControllerMus::ActivateApp(const std::string& app_id, |
- ash::LaunchSource source, |
+ ash::ShelfLaunchSource source, |
int event_flags) { |
NOTIMPLEMENTED(); |
} |
@@ -165,12 +165,11 @@ void ChromeLauncherControllerMus::SetRefocusURLPatternForTest(ash::ShelfID id, |
NOTIMPLEMENTED(); |
} |
-ash::ShelfItemDelegate::PerformedAction |
-ChromeLauncherControllerMus::ActivateWindowOrMinimizeIfActive( |
+ash::ShelfAction ChromeLauncherControllerMus::ActivateWindowOrMinimizeIfActive( |
ui::BaseWindow* window, |
bool allow_minimize) { |
NOTIMPLEMENTED(); |
- return ash::ShelfItemDelegate::kNoAction; |
+ return ash::SHELF_ACTION_NONE; |
} |
void ChromeLauncherControllerMus::ActiveUserChanged( |