chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc - Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate. (Closed)

Patch Set: Address comments. 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/wm/window_util_unittest.cc ('K') | « chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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;

}