Detach notification surface

ui/arc/notification/arc_notification_content_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_notification_content_view.h"
 
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "components/exo/notification_surface.h"
@@ skipping 342 matching lines @@
 
   // Reset |floating_control_buttons_widget_| when |surface_| is changed.
   floating_control_buttons_widget_.reset();
   control_buttons_view_ = nullptr;
   settings_button_ = nullptr;
   close_button_.reset();
 
   if (surface_ && surface_->window()) {
     surface_->window()->RemoveObserver(this);
     surface_->window()->RemovePreTargetHandler(event_forwarder_.get());
+
+    if (GetWidget())
+      Detach();
   }
 
   surface_ = surface;
 
   if (surface_ && surface_->window()) {
     surface_->window()->AddObserver(this);
     surface_->window()->AddPreTargetHandler(event_forwarder_.get());
 
     if (GetWidget())
       AttachSurface();
@@ skipping 57 matching lines @@
 void ArcNotificationContentView::UpdateSnapshot() {
   // Bail if we have a |surface_| because it controls the sizes and paints UI.
   if (surface_)
     return;
 
   UpdatePreferredSize();
   SchedulePaint();
 }
 
 void ArcNotificationContentView::AttachSurface() {
+  DCHECK(!native_view());
+
   if (!GetWidget())
     return;
 
   UpdatePreferredSize();
   Attach(surface_->window());
 
   // The texture for this window can be placed at subpixel position
   // with fractional scale factor. Force to align it at the pixel
   // boundary here, and when layout is updated in Layout().
   ash::wm::SnapWindowToPixelBoundary(surface_->window());
@@ skipping 55 matching lines @@
                               native_view()) != widget)) {
       return;
     }
   }
 
   views::NativeViewHost::ViewHierarchyChanged(details);
 
   if (!widget || !surface_ || !details.is_add)
     return;
 
+  if (native_view())
+    Detach();
   AttachSurface();
 }
 
 void ArcNotificationContentView::Layout() {
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
   views::NativeViewHost::Layout();
 
   if (!surface_ || !GetWidget())
     return;
@@ skipping 195 matching lines @@
       settings_button_->SchedulePaint();
     }
     if (close_button_) {
       close_button_->SetBackground(views::CreateSolidBackground(current_color));
       close_button_->SchedulePaint();
     }
   }
 }
 
 }  // namespace arc