Merge "arc: Fix custom notification crash on closing"

ui/arc/notification/arc_custom_notification_item.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/arc/notification/arc_custom_notification_item.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/exo/notification_surface.h"
@@ skipping 36 matching lines @@
 }  // namespace
 
 ArcCustomNotificationItem::ArcCustomNotificationItem(
     ArcNotificationManager* manager,
     message_center::MessageCenter* message_center,
     const std::string& notification_key,
     const AccountId& profile_id)
     : ArcNotificationItem(manager,
                           message_center,
                           notification_key,
-                          profile_id) {}
+                          profile_id) {
+  ArcNotificationSurfaceManager::Get()->AddObserver(this);
+}
 
 ArcCustomNotificationItem::~ArcCustomNotificationItem() {
   if (ArcNotificationSurfaceManager::Get())
     ArcNotificationSurfaceManager::Get()->RemoveObserver(this);
 
   FOR_EACH_OBSERVER(Observer, observers_, OnItemDestroying());
 }
 
 void ArcCustomNotificationItem::UpdateWithArcNotificationData(
     const mojom::ArcNotificationData& data) {
@@ skipping 18 matching lines @@
       base::UTF8ToUTF16(data.title.get()),
       base::UTF8ToUTF16(data.message.get()), gfx::Image(),
       base::UTF8ToUTF16("arc"),  // display source
       GURL(),                    // empty origin url, for system component
       notifier_id, rich_data, new ArcNotificationDelegate(this)));
 
   exo::NotificationSurface* surface =
       ArcNotificationSurfaceManager::Get()->GetSurface(notification_key());
   if (surface)
     OnNotificationSurfaceAdded(surface);
-  else
-    ArcNotificationSurfaceManager::Get()->AddObserver(this);
 
   pinned_ = rich_data.pinned;
   FOR_EACH_OBSERVER(Observer, observers_, OnItemPinnedChanged());
 }
 
 void ArcCustomNotificationItem::CloseFromCloseButton() {
   // Needs to manually remove notification from MessageCenter because
   // the floating close button is not part of MessageCenter.
   message_center()->RemoveNotification(notification_id(), true);
   Close(true);
@@ skipping 17 matching lines @@
   static_cast<ArcNotificationDelegate*>(pending_notification()->delegate())
       ->set_notification_surface(surface);
   AddToMessageCenter();
 }
 
 void ArcCustomNotificationItem::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key())
     return;
 
-  OnClosedFromAndroid(false);
+  FOR_EACH_OBSERVER(Observer, observers_, OnItemNotificationSurfaceRemoved());
 }
 
 }  // namespace arc