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

Unified Diff: chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc

Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate. (Closed)
Patch Set: nit 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
Index: chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
index 3c247b5b0d53cbb711b8e1051bb1fda4c0932358..f4c67bcc9144c2ddab7326a8885d02075625606b 100644
--- a/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc
@@ -21,8 +21,11 @@ ArcPlaystoreShortcutLauncherItemController::
ArcPlaystoreShortcutLauncherItemController::
~ArcPlaystoreShortcutLauncherItemController() {}
-ash::ShelfItemDelegate::PerformedAction
-ArcPlaystoreShortcutLauncherItemController::Activate(ash::LaunchSource source) {
+ash::ShelfAction ArcPlaystoreShortcutLauncherItemController::ItemSelected(
+ ui::EventType event_type,
+ int event_flags,
+ int64_t display_id,
+ ash::ShelfLaunchSource source) {
arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
DCHECK(arc_session_manager);
DCHECK(arc_session_manager->IsAllowed());
@@ -44,5 +47,5 @@ ArcPlaystoreShortcutLauncherItemController::Activate(ash::LaunchSource source) {
arc::kPlayStoreAppId, true));
}
- return kNoAction;
+ return ash::SHELF_ACTION_NONE;
}

Powered by Google App Engine
This is Rietveld 408576698