Fix dcheck on win aura shutdown, use CloseNow to close secondary widgets

ui/views/widget/native_widget_aura.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/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/activation_client.h"
@@ skipping 885 matching lines @@
 }
 
 #if defined(OS_WIN)
 namespace {
 BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
   aura::Window* root_window =
       DesktopRootWindowHostWin::GetContentWindowForHWND(hwnd);
   if (root_window) {
     Widget* widget = Widget::GetWidgetForNativeView(root_window);
     if (widget && widget->is_secondary_widget())
-      widget->Close();
+      // To avoid the delay in shutdown caused by using Close which may wait
+      // for animations, use CloseNow. Because this is only used on secondary
+      // widgets it seems relatively safe to skip the extra processing of
+      // Close.
+      widget->CloseNow();
   }
   return TRUE;
 }
 }  // namespace
 #endif
 
 // static
 void Widget::CloseAllSecondaryWidgets() {
 #if defined(OS_WIN)
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
@@ skipping 114 matching lines @@
   return aura::Env::GetInstance()->is_mouse_button_down();
 }
 
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 }  // namespace internal
 }  // namespace views