chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2811853002: reland: mash: Remove ChromeLauncherController's |id_to_item_controller_map_|.

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 2811853002: reland: mash: Remove ChromeLauncherController's |id_to_item_controller_map_|. (Closed)

Patch Set: Created 3 years, 8 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_launcher_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('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_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 fa6835c41665c6620b6045c7204dcf42aa50be97..17509cfdd66229d140e7670c4cb6001477759a39 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

@@ -8,6 +8,7 @@

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/shared/app_types.h"

#include "ash/shelf/shelf_delegate.h"

+#include "ash/shelf/shelf_model.h"

#include "ash/shell.h"

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/wm/window_properties.h"

@@ -659,7 +660,8 @@ ArcAppWindowLauncherController::AttachControllerToTask(

if (!shelf_id) {

owner()->CreateAppLauncherItem(std::move(controller), ash::STATUS_RUNNING);

} else {

- owner()->SetShelfItemDelegate(shelf_id, std::move(controller));

+ ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();

+ shelf_model->SetShelfItemDelegate(shelf_id, std::move(controller));

owner()->SetItemStatus(shelf_id, ash::STATUS_RUNNING);

}

item_controller->AddTaskId(task_id);