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

Unified Diff: ash/shelf/shelf_tooltip_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
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.h ('k') | ash/shelf/shelf_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_tooltip_manager.cc
diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
index 3f9bbed3ae24c7f216c18382cc1eb35a9da1728d..de34fb680b2273d54ce210ba35d9b071206551cc 100644
--- a/ash/shelf/shelf_tooltip_manager.cc
+++ b/ash/shelf/shelf_tooltip_manager.cc
@@ -101,7 +101,7 @@ ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
weak_factory_(this) {}
ShelfTooltipManager::~ShelfTooltipManager() {
- WillDeleteShelf();
+ WillDeleteShelfLayoutManager();
Shell::GetInstance()->RemovePointerWatcher(this);
@@ -226,7 +226,7 @@ void ShelfTooltipManager::OnWindowDestroying(aura::Window* window) {
}
}
-void ShelfTooltipManager::WillDeleteShelf() {
+void ShelfTooltipManager::WillDeleteShelfLayoutManager() {
if (shelf_layout_manager_)
shelf_layout_manager_->RemoveObserver(this);
shelf_layout_manager_ = nullptr;
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.h ('k') | ash/shelf/shelf_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698