exo: Close widget at the top of ShellSurface dtor.

components/exo/shell_surface.cc

 // Copyright 2015 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 "components/exo/shell_surface.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 218 matching lines @@
 
 ShellSurface::ShellSurface(Surface* surface)
     : ShellSurface(surface,
                    nullptr,
                    gfx::Rect(),
                    true,
                    ash::kShellWindowId_DefaultContainer) {}
 
 ShellSurface::~ShellSurface() {
   DCHECK(!scoped_configure_);
-  ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
-  if (surface_) {
-    if (scale_ != 1.0)
-      surface_->window()->SetTransform(gfx::Transform());
-    surface_->SetSurfaceDelegate(nullptr);
-    surface_->RemoveSurfaceObserver(this);
-  }
-  if (parent_)
-    parent_->RemoveObserver(this);
   if (resizer_)
     EndDrag(false /* revert */);
   if (widget_) {
     ash::wm::GetWindowState(widget_->GetNativeWindow())->RemoveObserver(this);
     widget_->GetNativeWindow()->RemoveObserver(this);
     if (widget_->IsVisible())
       widget_->Hide();
     widget_->CloseNow();
   }
+  ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
+  if (parent_)
+    parent_->RemoveObserver(this);
+  if (surface_) {
+    if (scale_ != 1.0)
+      surface_->window()->SetTransform(gfx::Transform());
+    surface_->SetSurfaceDelegate(nullptr);
+    surface_->RemoveSurfaceObserver(this);
+  }
 }
 
 void ShellSurface::AcknowledgeConfigure(uint32_t serial) {
   TRACE_EVENT1("exo", "ShellSurface::AcknowledgeConfigure", "serial", serial);
 
   // Apply all configs that are older or equal to |serial|. The result is that
   // the origin of the main surface will move and the resize direction will
   // change to reflect the acknowledgement of configure request with |serial|
   // at the next call to Commit().
   while (!pending_configs_.empty()) {
@@ skipping 909 matching lines @@
                                         &shadow_bounds);
       shadow_overlay_->SetBounds(shadow_bounds);
       shadow_underlay_->SetBounds(shadow_bounds);
       shadow->SetContentBounds(gfx::Rect(shadow_bounds.size()));
       wm::SetShadowType(window, wm::SHADOW_TYPE_RECTANGULAR);
     }
   }
 }
 
 }  // namespace exo