Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: ash/shell.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
« no previous file with comments | « ash/shell.h ('k') | ash/wm/aura/wm_shelf_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d7626ba38f01bfc7342c89e76ae45f4abe5fe11f..3cb781f6911644e5a2256e98b715ae30e224b966 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -486,12 +486,12 @@ void Shell::ShowShelf() {
(*iter)->ShowShelf();
}
-void Shell::HideShelf() {
+void Shell::ShutdownShelf() {
RootWindowControllerList controllers = GetAllRootWindowControllers();
for (RootWindowControllerList::iterator iter = controllers.begin();
iter != controllers.end(); ++iter) {
if ((*iter)->shelf())
- (*iter)->shelf()->ShutdownStatusAreaWidget();
+ (*iter)->shelf()->Shutdown();
}
}
@@ -754,7 +754,7 @@ Shell::~Shell() {
// Destroy SystemTrayDelegate before destroying the status area(s). Make sure
// to deinitialize the shelf first, as it is initialized after the delegate.
- HideShelf();
+ ShutdownShelf();
system_tray_delegate_->Shutdown();
system_tray_delegate_.reset();
« no previous file with comments | « ash/shell.h ('k') | ash/wm/aura/wm_shelf_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698