Merge 244295 "Ensure that trackpad and trackpoint scrolling work..."

ui/views/win/hwnd_message_handler.h

Index: ui/views/win/hwnd_message_handler.h
===================================================================
--- ui/views/win/hwnd_message_handler.h	(revision 244297)
+++ ui/views/win/hwnd_message_handler.h	(working copy)
@@ -321,6 +321,10 @@
     MESSAGE_HANDLER_EX(WM_DEADCHAR, OnImeMessages)
     MESSAGE_HANDLER_EX(WM_SYSDEADCHAR, OnImeMessages)
 
+    // Scroll events
+    MESSAGE_HANDLER_EX(WM_VSCROLL, OnScrollMessage)
+    MESSAGE_HANDLER_EX(WM_HSCROLL, OnScrollMessage)
+
     // Touch Events.
     MESSAGE_HANDLER_EX(WM_TOUCH, OnTouchEvent)
 
@@ -403,6 +407,7 @@
   LRESULT OnNotify(int w_param, NMHDR* l_param);
   void OnPaint(HDC dc);
   LRESULT OnReflectedMessage(UINT message, WPARAM w_param, LPARAM l_param);
+  LRESULT OnScrollMessage(UINT message, WPARAM w_param, LPARAM l_param);
   LRESULT OnSetCursor(UINT message, WPARAM w_param, LPARAM l_param);
   void OnSetFocus(HWND last_focused_window);
   LRESULT OnSetIcon(UINT size_type, HICON new_icon);
@@ -522,6 +527,9 @@
   // Generates touch-ids for touch-events.
   ui::SequentialIDGenerator id_generator_;
 
+  // Indicates if the window has the WS_VSCROLL and WS_HSCROLL styles set.
+  bool scroll_styles_set_;
+
   DISALLOW_COPY_AND_ASSIGN(HWNDMessageHandler);
 };