Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/app_list/app_list_controller_ash.h

Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.h
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
index 4da1b70c0447d50ab43c6e2ea86be6db815167cf..c481e218af36168417b19463f4d53b3587402b8d 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_
 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_
 
+#include "ash/public/cpp/shelf_types.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 
 namespace app_list {
 class AppListPresenterImpl;
@@ -50,7 +50,7 @@ class AppListControllerDelegateAsh : public AppListControllerDelegate {
   bool ShouldShowUserIcon() override;
 
  private:
-  ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);
+  ash::ShelfLaunchSource AppListSourceToLaunchSource(AppListSource source);
 
   // Not owned.
   app_list::AppListPresenterImpl* app_list_presenter_;