Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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;
 }
 
 class AppListControllerDelegateAsh : public AppListControllerDelegate {
  public:
   explicit AppListControllerDelegateAsh(app_list::AppListPresenterImpl*);
   ~AppListControllerDelegateAsh() override;
 
@@ skipping 21 matching lines @@
                    AppListSource source,
                    int event_flags) override;
   void LaunchApp(Profile* profile,
                  const extensions::Extension* extension,
                  AppListSource source,
                  int event_flags) override;
   void ShowForProfileByPath(const base::FilePath& profile_path) override;
   bool ShouldShowUserIcon() override;
 
  private:
-  ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);
+  ash::ShelfLaunchSource AppListSourceToLaunchSource(AppListSource source);
 
   // Not owned.
   app_list::AppListPresenterImpl* app_list_presenter_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListControllerDelegateAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_CONTROLLER_ASH_H_