Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/launcher_controller_helper.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/launcher/launcher_controller_helper.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 66 matching lines @@
   }
   return nullptr;
 }
 
 const extensions::Extension* GetExtensionByID(Profile* profile,
                                               const std::string& id) {
   return extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
       id, extensions::ExtensionRegistry::EVERYTHING);
 }
 
-std::string GetSourceFromAppListSource(ash::LaunchSource source) {
+std::string GetSourceFromAppListSource(ash::ShelfLaunchSource source) {
   switch (source) {
     case ash::LAUNCH_FROM_APP_LIST:
       return std::string(extension_urls::kLaunchSourceAppList);
     case ash::LAUNCH_FROM_APP_LIST_SEARCH:
       return std::string(extension_urls::kLaunchSourceAppListSearch);
     default:
       return std::string();
   }
 }
 
@@ skipping 65 matching lines @@
       return false;
     if (!arc_session_manager->IsArcEnabled() &&
         arc_session_manager->IsArcManaged())
       return false;
   }
 
   return true;
 }
 
 void LauncherControllerHelper::LaunchApp(ash::AppLauncherId id,
-                                         ash::LaunchSource source,
+                                         ash::ShelfLaunchSource source,
                                          int event_flags) {
   const std::string& app_id = id.app_id();
   const ArcAppListPrefs* arc_prefs = GetArcAppListPrefs();
   if (arc_prefs && arc_prefs->IsRegistered(app_id)) {
     arc::LaunchApp(profile_, app_id, event_flags);
     return;
   }
 
   // |extension| could be null when it is being unloaded for updating.
   const extensions::Extension* extension = GetExtensionByID(profile_, app_id);
@@ skipping 35 matching lines @@
 
 void LauncherControllerHelper::ExtensionEnableFlowFinished() {
   LaunchApp(ash::AppLauncherId(extension_enable_flow_->extension_id()),
             ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
   extension_enable_flow_.reset();
 }
 
 void LauncherControllerHelper::ExtensionEnableFlowAborted(bool user_initiated) {
   extension_enable_flow_.reset();
 }