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

Unified Diff: ui/message_center/views/message_center_bubble.cc

Issue 2031763003: Remove itself from the widget observers in destructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for comment #17 Created 4 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/message_center_bubble.cc
diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc
index 5f7d30bc5efb81c717e64d594304aafdc930f9d6..c65587b2537f1906159a3772a49b0ae6fc717bdc 100644
--- a/ui/message_center/views/message_center_bubble.cc
+++ b/ui/message_center/views/message_center_bubble.cc
@@ -68,6 +68,10 @@ MessageCenterBubble::MessageCenterBubble(MessageCenter* message_center,
first_item_has_no_margin_(first_item_has_no_margin) {}
MessageCenterBubble::~MessageCenterBubble() {
+ // Removs this from the widget observers just in case. MessageCenterBubble
+ // might be destoryed without calling its Widget's Close/CloseNow.
+ if (bubble_view() && bubble_view()->GetWidget())
+ bubble_view()->GetWidget()->RemoveObserver(this);
}
void MessageCenterBubble::SetSettingsVisible() {
@@ -124,7 +128,8 @@ void MessageCenterBubble::UpdateBubbleView() {
}
void MessageCenterBubble::OnWidgetClosing(views::Widget* widget) {
- bubble_view()->GetWidget()->RemoveObserver(this);
+ if (bubble_view() && bubble_view()->GetWidget())
+ bubble_view()->GetWidget()->RemoveObserver(this);
if (message_center_view_)
message_center_view_->SetIsClosing(true);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698