chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc - Issue 2870683002: ash: Remove ShelfModel id conversion functions.

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 2870683002: ash: Remove ShelfModel id conversion functions. (Closed)

Patch Set: Address comments. Created 3 years, 7 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/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc » ('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 2060935035a032cf6d0cbfd9817a89945ed700f6..414b768c7cbe947bdea28f1d60ef8a5015d57503 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

@@ -153,8 +153,7 @@ void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {

controller->AddAppWindow(app_window);

// Check for any existing pinned shelf item with a matching |shelf_id|.

- const int item_index = owner()->shelf_model()->ItemIndexByID(shelf_id);

- if (item_index < 0) {

+ if (owner()->GetItem(shelf_id) == nullptr) {

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

// Restore any existing app icon and flag as set.

if (app_window->HasCustomIcon() && !app_window->app_icon().IsEmpty()) {