Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/shelf_controller.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 "ash/common/shelf/shelf_controller.h"
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
@@ skipping 36 matching lines @@
   }
   const std::map<uint32_t, base::string16>& window_id_to_title() const {
     return window_id_to_title_;
   }
 
   const base::string16& title() { return title_; }
   void set_title(const base::string16& title) { title_ = title; }
 
  private:
   // ShelfItemDelegate:
-  ShelfItemDelegate::PerformedAction ItemSelected(
-      const ui::Event& event) override {
+  ShelfAction ItemSelected(ui::EventType event_type,
+                           int event_flags,
+                           int64_t display_id,
+                           ShelfLaunchSource source) override {
     if (window_id_to_title_.empty()) {
       delegate_->LaunchItem();
       return kNewWindowCreated;
     }
     if (window_id_to_title_.size() == 1) {
       // TODO(mash): Activate the window and return kExistingWindowActivated.
       NOTIMPLEMENTED();
     }
     return kNoAction;
   }
@@ skipping 162 matching lines @@
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id];
   int index = model_.ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItem item = *model_.ItemByID(shelf_id);
   item.image = GetShelfIconFromBitmap(image);
   model_.Set(index, item);
 }
 
 }  // namespace ash