Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

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

 // 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.
 
 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 124 matching lines @@
 void AppListControllerDelegateAsh::ShowForProfileByPath(
     const base::FilePath& profile_path) {
   // Ash doesn't have profile switching.
   NOTREACHED();
 }
 
 bool AppListControllerDelegateAsh::ShouldShowUserIcon() {
   return false;
 }
 
-ash::LaunchSource AppListControllerDelegateAsh::AppListSourceToLaunchSource(
+ash::ShelfLaunchSource
+AppListControllerDelegateAsh::AppListSourceToLaunchSource(
     AppListSource source) {
   switch (source) {
     case LAUNCH_FROM_APP_LIST:
       return ash::LAUNCH_FROM_APP_LIST;
     case LAUNCH_FROM_APP_LIST_SEARCH:
       return ash::LAUNCH_FROM_APP_LIST_SEARCH;
     default:
       return ash::LAUNCH_FROM_UNKNOWN;
   }
 }