add HideAndClose in preference to having Close sometimes magically defer

ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

 // Copyright (c) 2012 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/views/widget/desktop_aura/desktop_root_window_host_win.h"
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/focus_manager.h"
@@ skipping 40 matching lines @@
 DesktopRootWindowHostWin::DesktopRootWindowHostWin(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const gfx::Rect& initial_bounds)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           message_handler_(new HWNDMessageHandler(this))),
       native_widget_delegate_(native_widget_delegate),
       desktop_native_widget_aura_(desktop_native_widget_aura),
       root_window_host_delegate_(NULL),
       content_window_(NULL),
-      should_animate_window_close_(false),
       pending_close_(false) {
 }
 
 DesktopRootWindowHostWin::~DesktopRootWindowHostWin() {
   if (corewm::UseFocusControllerOnDesktop()) {
     aura::client::SetFocusClient(root_window_, NULL);
     aura::client::SetActivationClient(root_window_, NULL);
   }
 }
 
@@ skipping 93 matching lines @@
 
   drag_drop_client_.reset(new DesktopDragDropClientWin(root_window_,
                                                        GetHWND()));
   aura::client::SetDragDropClient(root_window_, drag_drop_client_.get());
 
   focus_client_->FocusWindow(content_window_);
   root_window_->SetProperty(kContentWindowForRootWindow, content_window_);
 
   aura::client::SetAnimationHost(content_window_, this);
 
-  should_animate_window_close_ =
-      content_window_->type() != aura::client::WINDOW_TYPE_NORMAL &&
-      !views::corewm::WindowAnimationsDisabled(content_window_);
-
   return root_window_;
 }
 
 void DesktopRootWindowHostWin::InitFocus(aura::Window* window) {
   focus_client_->FocusWindow(window);
 }
 
+bool DesktopRootWindowHostWin::SetCloseOnHideCompletion() {
+  bool should_animate_window_close =
+      content_window_->type() != aura::client::WINDOW_TYPE_NORMAL &&
+      !views::corewm::WindowAnimationsDisabled(content_window_);
+
+  // OnWindowHidingAnimationCompleted will do a Close if this is set.
+  pending_close_ = should_animate_window_close;
+  return pending_close_;
+}
+
 void DesktopRootWindowHostWin::Close() {
-  if (should_animate_window_close_) {
-    pending_close_ = true;
-    // OnWindowHidingAnimationCompleted does the actual Close.
-    content_window_->Hide();
-  } else {
-    message_handler_->Close();
-  }
+  message_handler_->Close();
 }
 
 void DesktopRootWindowHostWin::CloseNow() {
   message_handler_->CloseNow();
 }
 
 aura::RootWindowHost* DesktopRootWindowHostWin::AsRootWindowHost() {
   return this;
 }
 
@@ skipping 630 matching lines @@
 DesktopRootWindowHost* DesktopRootWindowHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const gfx::Rect& initial_bounds) {
   return new DesktopRootWindowHostWin(native_widget_delegate,
                                       desktop_native_widget_aura,
                                       initial_bounds);
 }
 
 }  // namespace views