Index: ui/arc/notification/arc_custom_notification_view.h |
diff --git a/ui/arc/notification/arc_custom_notification_view.h b/ui/arc/notification/arc_custom_notification_view.h |
index 0e58d7e48aa683de03a34692e2b42f728408369b..6af56841a2aab374bbb0e1994f76ae85c923d711 100644 |
--- a/ui/arc/notification/arc_custom_notification_view.h |
+++ b/ui/arc/notification/arc_custom_notification_view.h |
@@ -70,7 +70,7 @@ class ArcCustomNotificationView |
void CreateCloseButton(); |
void CreateSettingsButton(); |
- void CreateFloatingControlButtons(); |
+ void MaybeCreateFloatingControlButtons(); |
void SetSurface(exo::NotificationSurface* surface); |
void UpdatePreferredSize(); |
void UpdateControlButtonsVisibility(); |
@@ -116,6 +116,8 @@ class ArcCustomNotificationView |
void AnimationEnded(const gfx::Animation* animation) override; |
void AnimationProgressed(const gfx::Animation* animation) override; |
+ // If |item_| is null, we may be about to be destroyed. In this case, |
+ // we have to be careful about what we do. |
ArcCustomNotificationItem* item_ = nullptr; |
exo::NotificationSurface* surface_ = nullptr; |