chrome/browser/ui/ash/launcher/arc_app_deferred_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_deferred_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/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.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_deferred_launcher_controller.cc

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

index 247a047e2bb1681bff1b7bcf8a0f1c37cf805dee..3dad13ed4aa96a7434c4408590d5c8795b6b6f2f 100644

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

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

@@ -99,7 +99,8 @@ void ArcAppDeferredLauncherController::Close(const std::string& app_id) {

if (it == app_controller_map_.end())

return;

- const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);

+ const ash::ShelfID shelf_id =

+ owner_->GetShelfIDForAppID(shelf_app_id, shelf_app_id);

const bool need_close_item =

it->second == owner_->GetLauncherItemController(shelf_id);

app_controller_map_.erase(it);

@@ -158,7 +159,8 @@ void ArcAppDeferredLauncherController::RegisterDeferredLaunch(

const std::string& app_id) {

const std::string shelf_app_id =

ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);

- const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);

+ const ash::ShelfID shelf_id =

+ owner_->GetShelfIDForAppID(shelf_app_id, shelf_app_id);

if (shelf_id) {

LauncherItemController* controller =