Merge "arc: Fix custom notification crash on closing"

ui/arc/notification/arc_custom_notification_view.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_view.h"
 
 #include "components/exo/notification_surface.h"
 #include "components/exo/surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 59 matching lines @@
   views::Widget* widget = GetWidget();
 
   // Bail if native_view() has attached to a different widget.
   if (widget && native_view() &&
       views::Widget::GetTopLevelWidgetForNativeView(native_view()) != widget) {
     return;
   }
 
   views::NativeViewHost::ViewHierarchyChanged(details);
 
-  if (!widget || !details.is_add)
+  if (!widget || !surface_ || !details.is_add)
     return;
 
   SetPreferredSize(surface_->GetSize());
   Attach(surface_->window());
 }
 
 void ArcCustomNotificationView::Layout() {
   views::NativeViewHost::Layout();
 
-  if (!floating_close_button_widget_ || !GetWidget())
+  if (!floating_close_button_widget_ || !surface_ || !GetWidget())
     return;
 
   gfx::Rect surface_local_bounds(surface_->window()->bounds().size());
   gfx::Rect close_button_bounds(floating_close_button_->GetPreferredSize());
   close_button_bounds.set_x(surface_local_bounds.right() -
                             close_button_bounds.width());
   close_button_bounds.set_y(surface_local_bounds.y());
   floating_close_button_widget_->SetBounds(close_button_bounds);
 }
 
 void ArcCustomNotificationView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (item_ && !item_->pinned() && sender == floating_close_button_) {
     item_->CloseFromCloseButton();
   }
 }
 
 void ArcCustomNotificationView::OnItemDestroying() {
   item_->RemoveObserver(this);
   item_ = nullptr;
+
+  // Reset |surface_| with |item_| since no one is observing the |surface_|
+  // after |item_| is gone and this view should be removed soon.
+  surface_ = nullptr;
 }
 
 void ArcCustomNotificationView::OnItemPinnedChanged() {
   if (item_->pinned() && floating_close_button_widget_) {
     floating_close_button_widget_.reset();
   } else if (!item_->pinned() && !floating_close_button_widget_) {
     CreateFloatingCloseButton();
   }
 }
 
+void ArcCustomNotificationView::OnItemNotificationSurfaceRemoved() {
+  surface_ = nullptr;
+}
+
 }  // namespace arc