chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h - 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.h

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_app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc » ('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.h

diff --git a/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h

index a8dcc681601040369b365aca98a18fffb5f86e96..aac915b6e7075309c7f02d859f642e50bffda3bf 100644

--- a/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h

+++ b/chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h

@@ -9,7 +9,6 @@

#include "base/macros.h"

#include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h"

-#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"

class ArcAppLauncher;

class ChromeLauncherController;

@@ -22,8 +21,10 @@ class ArcPlaystoreShortcutLauncherItemController

~ArcPlaystoreShortcutLauncherItemController() override;

// LauncherItemController overrides:

- ash::ShelfItemDelegate::PerformedAction Activate(

- ash::LaunchSource source) override;

+ ash::ShelfAction ItemSelected(ui::EventType event_type,

+ int event_flags,

+ int64_t display_id,

+ ash::ShelfLaunchSource source) override;

private:

std::unique_ptr<ArcAppLauncher> playstore_launcher_;