2 files changed, 6 insertions, 10 deletions
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index f54da9a..255c63d 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -913,11 +913,7 @@ LRESULT WidgetWin::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
   if (ProcessNativeControlMessage(message, w_param, l_param, &result))
     return result;
 
-  // 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);
+  result = base::WindowImpl::OnWndProc(message, w_param, l_param);
   if (message == WM_ACTIVATE)
     PostProcessActivateMessage(this, LOWORD(w_param));
   return result;
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 3fbcc93..072041f 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -303,6 +303,7 @@ class WidgetWin : public base::WindowImpl,
  protected:
   // Overridden from WindowImpl:
   virtual HICON GetDefaultWindowIcon() const;
+  virtual void OnFinalMessage(HWND window);
   virtual LRESULT OnWndProc(UINT message, WPARAM w_param, LPARAM l_param);
 
   // Message Handlers
@@ -374,7 +375,10 @@ class WidgetWin : public base::WindowImpl,
   virtual void OnMove(const CPoint& point) { SetMsgHandled(FALSE); }
   virtual void OnMoving(UINT param, const LPRECT new_bounds) { }
   virtual LRESULT OnMouseRange(UINT msg, WPARAM w_param, LPARAM l_param);
-  virtual LRESULT OnNCActivate(BOOL active) { SetMsgHandled(FALSE); return 0; }
+  virtual LRESULT OnNCActivate(BOOL active) {
+    SetMsgHandled(FALSE);
+    return 0;
+  }
   virtual LRESULT OnNCCalcSize(BOOL w_param, LPARAM l_param) {
     SetMsgHandled(FALSE);
     return 0;
@@ -448,10 +452,6 @@ class WidgetWin : public base::WindowImpl,
     SetMsgHandled(FALSE);
   }
 
-  // deletes this window as it is destroyed, override to provide different
-  // behavior.
-  virtual void OnFinalMessage(HWND window);
-
   // Start tracking all mouse events so that this window gets sent mouse leave
   // messages too. |is_nonclient| is true when we should track WM_NCMOUSELEAVE
   // messages instead of WM_MOUSELEAVE ones.