Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

ash/common/shelf/wm_shelf.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/wm_shelf.h"
 
 #include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_bezel_event_handler.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ash {
 
 // WmShelf::AutoHideEventHandler -----------------------------------------------
 
 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
 // TODO(mash): Add similar event handling support for mash.
 class WmShelf::AutoHideEventHandler : public ui::EventHandler {
  public:
@@ skipping 249 matching lines @@
   // found (which is true when indexes_left is -1) or b.) the last item was
   // requested (which is true when index was passed in as a negative number).
   if (found_index >= 0 && (indexes_left == -1 || item_index < 0)) {
     // Then set this one as active (or advance to the next item of its kind).
     ActivateShelfItem(found_index);
   }
 }
 
 // static
 void WmShelf::ActivateShelfItem(int item_index) {
-  // We pass in a keyboard event which will then trigger a switch to the
-  // next item if the current one is already active.
-  ui::KeyEvent event(ui::ET_KEY_RELEASED,
-                     ui::VKEY_UNKNOWN,  // The actual key gets ignored.
-                     ui::EF_NONE);
-
   ShelfModel* shelf_model = WmShell::Get()->shelf_model();
   const ShelfItem& item = shelf_model->items()[item_index];
   ShelfItemDelegate* item_delegate = shelf_model->GetShelfItemDelegate(item.id);
-  item_delegate->ItemSelected(event);
+  int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
+  item_delegate->ItemSelected(ui::ET_KEY_RELEASED, ui::EF_NONE, display_id,
+                              LAUNCH_FROM_UNKNOWN);
 }
 
 bool WmShelf::ProcessGestureEvent(const ui::GestureEvent& event) {
   // Can be called at login screen.
   if (!shelf_layout_manager_)
     return false;
   return shelf_layout_manager_->ProcessGestureEvent(event);
 }
 
 void WmShelf::AddObserver(WmShelfObserver* observer) {
@@ skipping 59 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   AnimationChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   for (auto& observer : observers_)
     observer.OnBackgroundTypeChanged(background_type, change_type);
 }
 
 }  // namespace ash