exo: Close widget at the top of ShellSurface dtor.

Allows widget close animations to use the scale assigned
to shell surface at the time it is destroyed.

BUG=628932, b/29082277

Review-Url: https://codereview.chromium.org/2157863002
Cr-Commit-Position: refs/heads/master@{#406044}

components/exo/shell_surface.cc

@@ -236,15 +236,6 @@ ShellSurface::ShellSurface(Surface* surface)
 
 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_) {
@@ -254,6 +245,15 @@ ShellSurface::~ShellSurface() {
       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) {