Reverting 23645.

views/widget/widget_win.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 285 matching lines @@
   // that disregards duplicate mouse moves when ending animation requires
   // a new hit-test to do some highlighting as in TabStrip::RemoveTabAnimation
   // to cause the close button to highlight.
   void ResetLastMouseMoveFlag() {
     last_mouse_event_was_move_ = false;
   }
 
  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
   // These are all virtual so that specialized Widgets can modify or augment
   // processing.
   // This list is in _ALPHABETICAL_ order!
   // Note: in the base class these functions must do nothing but convert point
   //       coordinates to client coordinates (if necessary) and forward the
   //       handling to the appropriate Process* function. This is so that
   //       subclasses can easily override these methods to do different things
@@ skipping 51 matching lines @@
   virtual void OnMButtonDblClk(UINT flags, const CPoint& point);
   virtual void OnMButtonDown(UINT flags, const CPoint& point);
   virtual void OnMButtonUp(UINT flags, const CPoint& point);
   virtual LRESULT OnMouseActivate(HWND window, UINT hittest_code, UINT message);
   virtual void OnMouseMove(UINT flags, const CPoint& point);
   virtual LRESULT OnMouseLeave(UINT message, WPARAM w_param, LPARAM l_param);
   virtual LRESULT OnMouseWheel(UINT message, WPARAM w_param, LPARAM l_param);
   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;
   }
   virtual LRESULT OnNCHitTest(const CPoint& pt) {
     SetMsgHandled(FALSE);
     return 0;
   }
   virtual void OnNCLButtonDblClk(UINT flags, const CPoint& point);
   virtual void OnNCLButtonDown(UINT flags, const CPoint& point);
@@ skipping 53 matching lines @@
   virtual void OnVScroll(int scroll_type, short position, HWND scrollbar) {
     SetMsgHandled(FALSE);
   }
   virtual void OnWindowPosChanging(WINDOWPOS* window_pos) {
     SetMsgHandled(FALSE);
   }
   virtual void OnWindowPosChanged(WINDOWPOS* window_pos) {
     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.
   void TrackMouseEvents(DWORD mouse_tracking_flags);
 
   // Actually handle mouse events. These functions are called by subclasses who
   // override the message handlers above to do the actual real work of handling
   // the event in the View system.
   bool ProcessMousePressed(const CPoint& point,
                            UINT flags,
@@ skipping 123 matching lines @@
 
   // Instance of accessibility information and handling for MSAA root
   CComPtr<IAccessible> accessibility_root_;
 
   scoped_ptr<DefaultThemeProvider> default_theme_provider_;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_WIN_H_