Index: base/window_impl.cc |
=================================================================== |
--- base/window_impl.cc (revision 23577) |
+++ base/window_impl.cc (working copy) |
@@ -155,8 +155,15 @@ |
// Handle the message if it's in our message map; otherwise, let the system |
// handle it. |
if (!ProcessWindowMessage(hwnd_, message, w_param, l_param, result)) |
- result = DefWindowProc(hwnd_, message, w_param, l_param); |
+ result = DefWindowProc(hwnd_, message, w_param, l_param); |
+ if (message == WM_NCDESTROY) { |
+ // Notify the subclass that this is the last message before the window |
+ // is destroyed. |
+ OnFinalMessage(hwnd_); |
+ hwnd_ = NULL; |
+ } |
+ |
return result; |
} |