ui/aura_shell/shelf_layout_controller.cc - Issue 8774029: Delete desktop/shell instance correctly when chrome is shutting down

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: ui/aura_shell/shelf_layout_controller.cc

Issue 8774029: Delete desktop/shell instance correctly when chrome is shutting down (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: close windows before observers are destroyed. Created 9 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:

Index: ui/aura_shell/shelf_layout_controller.cc

diff --git a/ui/aura_shell/shelf_layout_controller.cc b/ui/aura_shell/shelf_layout_controller.cc

index 7e7f851a68ed3a7e064679ea0e3ff1e70dc1e976..d26af3c875590636eb09f8cd3b1f3280ee90552c 100644

--- a/ui/aura_shell/shelf_layout_controller.cc

+++ b/ui/aura_shell/shelf_layout_controller.cc

@@ -35,7 +35,8 @@ ShelfLayoutController::ShelfLayoutController(views::Widget* launcher,

}

ShelfLayoutController::~ShelfLayoutController() {

- GetLayer(launcher_)->GetAnimator()->RemoveObserver(this);

+ // Do not try to remove observer from layer as the Launcher is

+ // already deleted.

}

void ShelfLayoutController::LayoutShelf() {

« no previous file with comments | « ui/aura/desktop_host_linux.cc ('k') | ui/aura_shell/shell.h » ('j') | no next file with comments »