chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc - Issue 2773493002: [Merge M58] arc: Fix regression in handling ARC shelf item.

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_app_window_launcher_item_controller.cc

Issue 2773493002: [Merge M58] arc: Fix regression in handling ARC shelf item. (Closed)

Patch Set: resolve merge conflicts and adopt to M58 Created 3 years, 9 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

index e84941fc5cd74ee6f00ee54bf130b7e18820d8ec..48c85869a815c7bfd3ad5cca21df2345bc3b08c2 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc

@@ -52,6 +52,11 @@ ash::ShelfAction ArcAppWindowLauncherItemController::ItemSelected(

return ash::SHELF_ACTION_NEW_WINDOW_CREATED;

}

+void ArcAppWindowLauncherItemController::ExecuteCommand(uint32_t command_id,

+ int32_t event_flags) {

+ ActivateIndexedApp(command_id);

ash::ShelfAppMenuItemList ArcAppWindowLauncherItemController::GetAppMenuItems(

int event_flags) {

ash::ShelfAppMenuItemList items;