chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc - Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type.

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/extension_app_window_launcher_controller.cc

Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type. (Closed)

Patch Set: Rebase; remove new LauncherItemController::TYPE_APP check. Created 4 years 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/chrome_launcher_controller_mus.cc ('k') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 138cec71e67b9313cdfbe6c35c00f69db23076ab..a1a8100cdee825cd0ec606343bc1c3a368cea995 100644

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

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

@@ -165,10 +165,9 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

shelf_id = controller->shelf_id();

controller->AddAppWindow(app_window);

} else {

- LauncherItemController::Type type = LauncherItemController::TYPE_APP;

std::string launch_id = GetLaunchId(app_window);

ExtensionAppWindowLauncherItemController* controller =

- new ExtensionAppWindowLauncherItemController(type, app_id, launch_id,

+ new ExtensionAppWindowLauncherItemController(app_id, launch_id,

owner());

controller->AddAppWindow(app_window);

// If there is already a shelf id mapped to this app_shelf_id (e.g. pinned),