Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h

Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
index e84a40d18036cbe9f43191ad6cae7b834e7b5c46..8c41068c34cc7222ad319cabc923dc772aff883e 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
@@ -43,10 +43,10 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
   bool IsListOfActiveBrowserEmpty();
 
   // LauncherItemController overrides:
-  ShelfItemDelegate::PerformedAction Activate(
-      ash::LaunchSource source) 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;
 
@@ -63,9 +63,9 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
   bool IsIncognito(content::WebContents* web_contents) const;
 
   // Activate a browser - or advance to the next one on the list.
-  // Returns the action performed. Should be one of kNoAction,
-  // kExistingWindowActivated, or kNewWindowCreated.
-  PerformedAction ActivateOrAdvanceToNextBrowser();
+  // Returns the action performed. Should be one of SHELF_ACTION_NONE,
+  // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_NEW_WINDOW_CREATED.
+  ash::ShelfAction ActivateOrAdvanceToNextBrowser();
 
   // Returns true when the given |browser| is listed in the browser application
   // list.