Reverting 23645.

base/window_impl.cc

 // Copyright (c) 2009 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 <list>
 
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/window_impl.h"
 #include "base/win_util.h"
@@ skipping 137 matching lines @@
 HICON WindowImpl::GetDefaultWindowIcon() const {
   return NULL;
 }
 
 LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
   LRESULT result = 0;
 
   // 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);
-
-  if (message == WM_NCDESTROY) {
-    // Notify the subclass that this is the last message before the window
-    // is destroyed.
-    OnFinalMessage(hwnd_);
-    hwnd_ = NULL;
-  }
+    result = DefWindowProc(hwnd_, message, w_param, l_param);
 
   return result;
 }
 
 // static
 LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd,
                                      UINT message,
                                      WPARAM w_param,
                                      LPARAM l_param) {
   if (message == WM_NCCREATE) {
@@ skipping 35 matching lines @@
   class_ex.hIconSm = class_ex.hIcon;
   ATOM atom = RegisterClassEx(&class_ex);
   DCHECK(atom);
 
   Singleton<ClassRegistrar>()->RegisterClass(class_info, name, atom);
 
   return name;
 }
 
 }  // namespace base