ash/shelf/shelf_layout_manager.cc - Issue 2000393003: ash: Reorder shutdown of ShelfLayoutManager and StatusAreaWidget

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: ash/shelf/shelf_layout_manager.cc

Issue 2000393003: ash: Reorder shutdown of ShelfLayoutManager and StatusAreaWidget (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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

Index: ash/shelf/shelf_layout_manager.cc

diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc

index ff95424866e43eb71462d8b27f3d071040a14ef6..b17a3be2f23c889e13e8fd9179dac54da3d84afe 100644

--- a/ash/shelf/shelf_layout_manager.cc

+++ b/ash/shelf/shelf_layout_manager.cc

@@ -248,7 +248,8 @@ ShelfLayoutManager::~ShelfLayoutManager() {

if (update_shelf_observer_)

update_shelf_observer_->Detach();

- FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_, WillDeleteShelf());

+ FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,

+ WillDeleteShelfLayoutManager());

Shell::GetInstance()->RemoveShellObserver(this);

Shell::GetInstance()->lock_state_controller()->RemoveObserver(this);

Shell::GetInstance()->

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager_observer.h » ('j') | no next file with comments »