win: Move HWNDMessageHandler's WeakPtrFactory member to the end.

ui/views/win/hwnd_message_handler.h

 // Copyright (c) 2012 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 UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_
 #define UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_
 
 #include <windows.h>
 
 #include <set>
@@ skipping 37 matching lines @@
 // Unfortunately if you override the standard non-client rendering as we do
 // with CustomFrameWindow, sometimes Windows (not deterministically
 // reproducibly but definitely frequently) will send these messages to the
 // window and paint the standard caption/title over the top of the custom one.
 // So we need to handle these messages in CustomFrameWindow to prevent this
 // from happening.
 const int WM_NCUAHDRAWCAPTION = 0xAE;
 const int WM_NCUAHDRAWFRAME = 0xAF;
 
 // IsMsgHandled() and BEGIN_SAFE_MSG_MAP_EX are a modified version of
-// BEGIN_MSG_MAP_EX. The main difference is it adds a WeakPtrFactory member
-// (|weak_factory_|) that is used in _ProcessWindowMessage() and changing
+// BEGIN_MSG_MAP_EX. The main difference is it uses a WeakPtrFactory member
+// (|weak_factory|) that is used in _ProcessWindowMessage() and changing
 // IsMsgHandled() from a member function to a define that checks if the weak
 // factory is still valid in addition to the member. Together these allow for
 // |this| to be deleted during dispatch.
 #define IsMsgHandled() !ref.get() || msg_handled_
 
-#define BEGIN_SAFE_MSG_MAP_EX(the_class) \
+#define BEGIN_SAFE_MSG_MAP_EX(weak_factory) \
  private: \
-  base::WeakPtrFactory<the_class> weak_factory_; \
   BOOL msg_handled_; \
 \
  public: \
   /* "handled" management for cracked handlers */ \
   void SetMsgHandled(BOOL handled) { \
     msg_handled_ = handled; \
   } \
   BOOL ProcessWindowMessage(HWND hwnd, \
                             UINT msg, \
                             WPARAM w_param, \
                             LPARAM l_param, \
                             LRESULT& l_result, \
                             DWORD msg_map_id = 0) { \
-    base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr()); \
+    base::WeakPtr<HWNDMessageHandler> ref(weak_factory.GetWeakPtr()); \
     BOOL old_msg_handled = msg_handled_; \
     BOOL ret = _ProcessWindowMessage(hwnd, msg, w_param, l_param, l_result, \
                                      msg_map_id); \
     if (ref.get()) \
       msg_handled_ = old_msg_handled; \
     return ret; \
   } \
   BOOL _ProcessWindowMessage(HWND hWnd, \
                              UINT uMsg, \
                              WPARAM wParam, \
                              LPARAM lParam, \
                              LRESULT& lResult, \
                              DWORD dwMsgMapID) { \
-    base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr()); \
+    base::WeakPtr<HWNDMessageHandler> ref(weak_factory.GetWeakPtr()); \
     BOOL bHandled = TRUE; \
     hWnd; \
     uMsg; \
     wParam; \
     lParam; \
     lResult; \
     bHandled; \
     switch(dwMsgMapID) { \
       case 0:
 
@@ skipping 202 matching lines @@
   // Synchronously updates the invalid contents of the Widget. Valid for
   // layered windows only.
   void RedrawLayeredWindowContents();
 
   // Attempts to force the window to be redrawn, ensuring that it gets
   // onscreen.
   void ForceRedrawWindow(int attempts);
 
   // Message Handlers ----------------------------------------------------------
 
-  BEGIN_SAFE_MSG_MAP_EX(HWNDMessageHandler)
+  BEGIN_SAFE_MSG_MAP_EX(weak_factory_)
     // Range handlers must go first!
     CR_MESSAGE_RANGE_HANDLER_EX(WM_MOUSEFIRST, WM_MOUSELAST, OnMouseRange)
     CR_MESSAGE_RANGE_HANDLER_EX(WM_NCMOUSEMOVE,
                                 WM_NCXBUTTONDBLCLK,
                                 OnMouseRange)
 
     // CustomFrameWindow hacks
     CR_MESSAGE_HANDLER_EX(WM_NCUAHDRAWCAPTION, OnNCUAHDrawCaption)
     CR_MESSAGE_HANDLER_EX(WM_NCUAHDRAWFRAME, OnNCUAHDrawFrame)
 
@@ skipping 291 matching lines @@
   long last_mouse_hwheel_time_;
 
   // On Windows Vista and beyond, if we are transitioning from custom frame
   // to Aero(glass) we delay setting the DWM related properties in full
   // screen mode as DWM is not supported in full screen windows. We perform
   // the DWM related operations when the window comes out of fullscreen mode.
   // This member variable is set to true if the window is transitioning to
   // glass. Defaults to false.
   bool dwm_transition_desired_;
 
+  base::WeakPtrFactory<HWNDMessageHandler> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(HWNDMessageHandler);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_