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

Unified Diff: ui/arc/notification/arc_custom_notification_item.cc

Issue 2120593002: arc: Fix custom notification crash on closing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ui/arc/notification/arc_custom_notification_item.cc
diff --git a/ui/arc/notification/arc_custom_notification_item.cc b/ui/arc/notification/arc_custom_notification_item.cc
index 153cf3e6a69ba2c9ba35c90fa4d0ff2051fbd98b..f5e31b1a4f92b688a9b6fab7b9c95f109b0b0396 100644
--- a/ui/arc/notification/arc_custom_notification_item.cc
+++ b/ui/arc/notification/arc_custom_notification_item.cc
@@ -54,7 +54,9 @@ ArcCustomNotificationItem::ArcCustomNotificationItem(
: ArcNotificationItem(manager,
message_center,
notification_key,
- profile_id) {}
+ profile_id) {
+ ArcNotificationSurfaceManager::Get()->AddObserver(this);
+}
ArcCustomNotificationItem::~ArcCustomNotificationItem() {
if (ArcNotificationSurfaceManager::Get())
@@ -93,8 +95,6 @@ void ArcCustomNotificationItem::UpdateWithArcNotificationData(
ArcNotificationSurfaceManager::Get()->GetSurface(notification_key());
if (surface)
OnNotificationSurfaceAdded(surface);
- else
- ArcNotificationSurfaceManager::Get()->AddObserver(this);
pinned_ = rich_data.pinned;
FOR_EACH_OBSERVER(Observer, observers_, OnItemPinnedChanged());
@@ -132,7 +132,7 @@ void ArcCustomNotificationItem::OnNotificationSurfaceRemoved(
if (surface->notification_id() != notification_key())
return;
- OnClosedFromAndroid(false);
+ FOR_EACH_OBSERVER(Observer, observers_, OnItemNotificationSurfaceRemoved());
}
} // namespace arc
« no previous file with comments | « ui/arc/notification/arc_custom_notification_item.h ('k') | ui/arc/notification/arc_custom_notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698