chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2290603002: Enhance chrome.app.window API for shelf integration with pinning support

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

Issue 2290603002: Enhance chrome.app.window API for shelf integration with pinning support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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

« chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc ('K') | « chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8ccca6d8158d98a048a1e4b2c52d4bb0da445ccf..e199a3ec34ecf5a0acc2e48454ae876e5abc6e26 100644

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

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

@@ -576,7 +576,7 @@ void ArcAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

shelf_id = controller->shelf_id();

} else {

controller = new ArcAppWindowLauncherItemController(app_id, owner());

- shelf_id = shelf_delegate_->GetShelfIDForAppID(app_id);

+ shelf_id = shelf_delegate_->GetShelfIDForAppID(app_id, app_id);

if (shelf_id == 0) {

// Map Play Store shelf icon to Arc Support host, to share one entry.

shelf_id = owner()->CreateAppLauncherItem(controller, app_id,