Reverting 23645.

views/widget/widget_win.cc

 // Copyright (c) 2006-2008 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 "views/widget/widget_win.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
@@ skipping 895 matching lines @@
 LRESULT WidgetWin::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
   HWND window = hwnd();
   LRESULT result = 0;
 
   // First allow messages sent by child controls to be processed directly by
   // their associated views. If such a view is present, it will handle the
   // message *instead of* this WidgetWin.
   if (ProcessNativeControlMessage(message, w_param, l_param, &result))
     return result;
 
-  result = base::WindowImpl::OnWndProc(message, w_param, l_param);
+  // Otherwise we handle everything else.
+  if (!ProcessWindowMessage(window, message, w_param, l_param, result))
+    result = DefWindowProc(window, message, w_param, l_param);
+  if (message == WM_NCDESTROY)
+    OnFinalMessage(window);
   if (message == WM_ACTIVATE)
     PostProcessActivateMessage(this, LOWORD(w_param));
   return result;
 }
 
 // static
 void WidgetWin::PostProcessActivateMessage(WidgetWin* widget,
                                            int activation_state) {
   if (!widget->focus_manager_.get()) {
     NOTREACHED();
@@ skipping 16 matching lines @@
   WidgetWin* popup = new WidgetWin;
   popup->set_window_style(WS_POPUP);
   popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
                              WS_EX_TRANSPARENT |
                              l10n_util::GetExtendedTooltipStyles());
   popup->set_delete_on_destroy(delete_on_destroy);
   return popup;
 }
 
 }  // namespace views