Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc

 // Copyright 2016 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/chrome_launcher_controller_mus.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 120 matching lines @@
   NOTIMPLEMENTED();
   return false;
 }
 
 bool ChromeLauncherControllerMus::IsPlatformApp(ash::ShelfID id) {
   NOTIMPLEMENTED();
   return false;
 }
 
 void ChromeLauncherControllerMus::ActivateApp(const std::string& app_id,
-                                              ash::LaunchSource source,
+                                              ash::ShelfLaunchSource source,
                                               int event_flags) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::SetLauncherItemImage(
     ash::ShelfID shelf_id,
     const gfx::ImageSkia& image) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::UpdateAppState(content::WebContents* contents,
                                                  AppState app_state) {
   NOTIMPLEMENTED();
 }
 
 ash::ShelfID ChromeLauncherControllerMus::GetShelfIDForWebContents(
     content::WebContents* contents) {
   NOTIMPLEMENTED();
   return ash::TYPE_UNDEFINED;
 }
 
 void ChromeLauncherControllerMus::SetRefocusURLPatternForTest(ash::ShelfID id,
                                                               const GURL& url) {
   NOTIMPLEMENTED();
 }
 
-ash::ShelfItemDelegate::PerformedAction
-ChromeLauncherControllerMus::ActivateWindowOrMinimizeIfActive(
+ash::ShelfAction ChromeLauncherControllerMus::ActivateWindowOrMinimizeIfActive(
     ui::BaseWindow* window,
     bool allow_minimize) {
   NOTIMPLEMENTED();
-  return ash::ShelfItemDelegate::kNoAction;
+  return ash::kNoAction;
 }
 
 void ChromeLauncherControllerMus::ActiveUserChanged(
     const std::string& user_email) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
     Profile* profile) {
   NOTIMPLEMENTED();
@@ skipping 115 matching lines @@
     app_id_to_item_delegate_.insert(
         std::make_pair(app_id, std::move(delegate)));
 
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app_id);
       app_icon_loader->UpdateImage(app_id);
     }
   }
 }