Index: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h |
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h |
index d6827ab5d49b3e01ccda240e242bd947b7d573be..b7581f7912b5b0282e55b73dee0b36608ff9d85f 100644 |
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h |
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h |
@@ -43,11 +43,11 @@ class AppWindowLauncherItemController : public LauncherItemController, |
ui::BaseWindow* GetAppWindow(aura::Window* window); |
// LauncherItemController overrides: |
- ash::ShelfItemDelegate::PerformedAction Activate( |
- ash::LaunchSource source) override; |
AppWindowLauncherItemController* AsAppWindowLauncherItemController() override; |
- ash::ShelfItemDelegate::PerformedAction ItemSelected( |
- const ui::Event& event) override; |
+ ash::ShelfAction ItemSelected(ui::EventType event_type, |
+ int event_flags, |
+ int64_t display_id, |
+ ash::ShelfLaunchSource source) override; |
ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; |
void Close() override; |
@@ -72,16 +72,15 @@ class AppWindowLauncherItemController : public LauncherItemController, |
// Called when app window is removed from controller. |
virtual void OnWindowRemoved(ui::BaseWindow* window) {} |
- // Returns the action performed. Should be one of kNoAction, |
- // kExistingWindowActivated, or kExistingWindowMinimized. |
- ash::ShelfItemDelegate::PerformedAction ShowAndActivateOrMinimize( |
- ui::BaseWindow* window); |
+ // Returns the action performed. Should be one of SHELF_ACTION_NONE, |
+ // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED. |
+ ash::ShelfAction ShowAndActivateOrMinimize(ui::BaseWindow* window); |
// Activate the given |window_to_show|, or - if already selected - advance to |
// the next window of similar type. |
- // Returns the action performed. Should be one of kNoAction, |
- // kExistingWindowActivated, or kExistingWindowMinimized. |
- ash::ShelfItemDelegate::PerformedAction ActivateOrAdvanceToNextAppWindow( |
+ // Returns the action performed. Should be one of SHELF_ACTION_NONE, |
+ // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_WINDOW_MINIMIZED. |
+ ash::ShelfAction ActivateOrAdvanceToNextAppWindow( |
ui::BaseWindow* window_to_show); |
private: |