chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc - Issue 2798173002: 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_launcher_browsertest.cc

Issue 2798173002: mash: Remove ChromeLauncherController's |id_to_item_controller_map_|. (Closed)

Patch Set: Remove get|set delegate helpers; cleanup. 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:

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

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

index b2bf0b83064647d8fd7900f0801ba39d18a2e402..4841f83ef9b32164010a9d5e7de72f4ffa83f575 100644

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

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

@@ -259,9 +259,7 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {

ash::ShelfItemDelegate* GetAppItemController(const std::string& id) {

const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(id);

- if (!shelf_id)

- return nullptr;

- return chrome_controller()->GetShelfItemDelegate(shelf_id);

+ return ash::Shell::Get()->shelf_model()->GetShelfItemDelegate(shelf_id);

}

ArcAppListPrefs* app_prefs() { return ArcAppListPrefs::Get(profile()); }