Make NativeControl inherit from base::WindowImpl instead of CWindowImpl to re...

views/widget/widget_win.h

Index: views/widget/widget_win.h
===================================================================
--- views/widget/widget_win.h	(revision 23577)
+++ views/widget/widget_win.h	(working copy)
@@ -303,6 +303,7 @@
  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 @@
   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 @@
     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.