Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 13770008: Fix dcheck on win aura shutdown, use CloseNow to close secondary widgets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 04af1cea6c204429f878c2efbe6f7f0103987e3b..fd9db9387b805bcbe730626c857d045e15d6f004 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -903,7 +903,11 @@ BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698