Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/shelf/shelf_controller.cc

Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate. (Closed)
Patch Set: Cleanup Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/common/shelf/app_list_shelf_item_delegate.cc ('K') | « ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc ('k') | ash/common/shelf/shelf_item_delegate.h » ('j') | ash/common/shelf/shelf_item_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_controller.cc
diff --git a/ash/common/shelf/shelf_controller.cc b/ash/common/shelf/shelf_controller.cc
index 02e6f1a60e41434311fc8399ef73a6fa097e03ef..87d24490aade87c9d4a775db294f8de2dcd570f8 100644
--- a/ash/common/shelf/shelf_controller.cc
+++ b/ash/common/shelf/shelf_controller.cc
@@ -54,8 +54,10 @@ class ShelfItemDelegateMus : public ShelfItemDelegate {
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;
« ash/common/shelf/app_list_shelf_item_delegate.cc ('K') | « ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc ('k') | ash/common/shelf/shelf_item_delegate.h » ('j') | ash/common/shelf/shelf_item_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698