chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc - Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate

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

Issue 23606016: Refactor LauncherItemController and LauncherItemDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for LauncherTest and observing LauncherModel in DelegateManager Created 7 years, 3 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

« ash/shell/launcher_item_delegate_impl.h ('K') | « chrome/browser/ui/ash/launcher/launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/shell_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/shell_window_launcher_controller.cc

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

index 618397c9e069eac5416cbb34c08db1e6f3c3d668..e8c4b1fb38e252e5837502fb7fbcd35443186c0b 100644

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

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

@@ -135,9 +135,9 @@ void ShellWindowLauncherController::OnWindowDestroying(aura::Window* window) {

// If this is the last window associated with the app launcher id, close the

// launcher item.

ash::LauncherID launcher_id = controller->launcher_id();

+ // |owner_| destroys |controller|.

owner_->CloseLauncherItem(launcher_id);

app_controller_map_.erase(iter2);

- delete controller;

}