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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 1828133004: Refine ash shelf tooltip closing on non-mash ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Avoid WillDeleteShelf in PrepareForShutdown; use aura::WindowObserver instead. Created 4 years, 9 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_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 74d5abf858bc96784bd37872caddec206e1ed9fd..6458119a5e3fc0b13a6b1f63cd4b5ac8a305a77b 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -280,7 +280,10 @@ class ShelfWindowTargeter : public wm::EasyResizeWindowTargeter,
}
// ash::ShelfLayoutManagerObserver:
- void WillDeleteShelf() override { shelf_ = NULL; }
+ void WillDeleteShelf() override {
+ shelf_->RemoveObserver(this);
+ shelf_ = NULL;
+ }
void WillChangeVisibilityState(ash::ShelfVisibilityState new_state) override {
gfx::Insets mouse_insets;
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698