Consolidate Widget Event code, other cleanup.

ui/views/widget/native_widget_win.cc

 // Copyright (c) 2011 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 "ui/views/widget/native_widget_win.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
@@ skipping 331 matching lines @@
   SetMsgHandled(FALSE);
 }
 
 void NativeWidgetWin::OnInitMenuPopup(HMENU menu, UINT position,
                                       BOOL is_system_menu) {
   SetMsgHandled(FALSE);
 }
 
 LRESULT NativeWidgetWin::OnKeyDown(UINT message, WPARAM w_param,
                                    LPARAM l_param) {
-  MSG msg;
-  MakeMSG(&msg, message, w_param, l_param);
+  MSG msg = { message, w_param, l_param };
   SetMsgHandled(listener_->OnKeyEvent(KeyEvent(msg)));
   return 0;
 }
 
 LRESULT NativeWidgetWin::OnKeyUp(UINT message, WPARAM w_param, LPARAM l_param) {
-  MSG msg;
-  MakeMSG(&msg, message, w_param, l_param);
+  MSG msg = { message, w_param, l_param };
   SetMsgHandled(listener_->OnKeyEvent(KeyEvent(msg)));
   return 0;
 }
 
 void NativeWidgetWin::OnKillFocus(HWND focused_window) {
   listener_->OnNativeBlur(focused_window);
   SetMsgHandled(FALSE);
 }
 
 LRESULT NativeWidgetWin::OnMouseActivate(HWND window, UINT hittest_code,
                                          UINT message) {
   SetMsgHandled(FALSE);
   return MA_ACTIVATE;
 }
 
 LRESULT NativeWidgetWin::OnMouseLeave(UINT message, WPARAM w_param,
                                       LPARAM l_param) {
   // TODO(beng): tooltip
-  MSG msg;
-  MakeMSG(&msg, message, w_param, l_param);
+  MSG msg = { message, w_param, l_param };
   SetMsgHandled(listener_->OnMouseEvent(MouseEvent(msg)));
 
   // Reset our tracking flag so that future mouse movement over this WidgetWin
   // results in a new tracking session.
   active_mouse_tracking_flags_ = 0;
 
   return 0;
 }
 
 void NativeWidgetWin::OnMove(const CPoint& point) {
@@ skipping 196 matching lines @@
     tme.dwHoverTime = 0;
     TrackMouseEvent(&tme);
   } else if (mouse_tracking_flags != active_mouse_tracking_flags_) {
     TrackMouseEvents(active_mouse_tracking_flags_ | TME_CANCEL);
     TrackMouseEvents(mouse_tracking_flags);
   }
 }
 
 bool NativeWidgetWin::ProcessMouseRange(UINT message, WPARAM w_param,
                                         LPARAM l_param, bool non_client) {
-  MSG msg;
-  MakeMSG(&msg, message, w_param, l_param);
+  MSG msg = { message, w_param, l_param };
   if (message == WM_MOUSEWHEEL) {
     // Reroute the mouse-wheel to the window under the mouse pointer if
     // applicable.
     // TODO(beng):
     //if (views::RerouteMouseWheel(hwnd(), w_param, l_param))
     //  return 0;
     return listener_->OnMouseWheelEvent(MouseWheelEvent(msg));
   }
   // Windows only fires WM_MOUSELEAVE events if the application begins
   // "tracking" mouse events for a given HWND during WM_MOUSEMOVE events.
   // We need to call |TrackMouseEvents| to listen for WM_MOUSELEAVE.
   if (!has_capture_)
     TrackMouseEvents(non_client ? TME_NONCLIENT | TME_LEAVE : TME_LEAVE);
   return listener_->OnMouseEvent(MouseEvent(msg));
 }
 
-void NativeWidgetWin::MakeMSG(MSG* msg, UINT message, WPARAM w_param,
-    LPARAM l_param, DWORD time, LONG x, LONG y) const {
-  msg->hwnd = hwnd();
-  msg->message = message;
-  msg->wParam = w_param;
-  msg->lParam = l_param;
-  msg->time = time;
-  msg->pt.x = x;
-  msg->pt.y = y;
-}
-
 void NativeWidgetWin::CloseNow() {
   DestroyWindow(hwnd());
 }
 
 bool NativeWidgetWin::IsLayeredWindow() const {
   return !!(window_ex_style() & WS_EX_LAYERED);
 }
 
 }  // namespace internal
 
@@ skipping 41 matching lines @@
     if (parent_widget) {
       widget = parent_widget;
       parent_hwnd = ::GetAncestor(parent_hwnd, GA_PARENT);
     }
   } while (parent_hwnd != NULL && parent_widget != NULL);
 
   return widget;
 }
 
 }  // namespace ui