Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

Index: chrome/browser/ui/ash/launcher/launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
index ed65f3c53b214205c2a41dfb1f156b9f44887708..5c1c538c14dbdf4f4f725dfb8cadd36c2bb90af2 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -11,7 +11,6 @@
 #include "ash/common/shelf/shelf_item_types.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "ui/events/event.h"
 
 class AppWindowLauncherItemController;
@@ -49,11 +48,6 @@ class LauncherItemController : public ash::ShelfItemDelegate {
     image_set_by_controller_ = image_set_by_controller;
   }
 
-  // Shows and activates the most-recently-active window associated with the
-  // item, or launches the item if it is not currently open.
-  // Returns the action performed by activating the item.
-  virtual PerformedAction Activate(ash::LaunchSource source) = 0;
-
   // Returns nullptr if class is not AppWindowLauncherItemController.
   virtual AppWindowLauncherItemController* AsAppWindowLauncherItemController();