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

ui/views/win/hwnd_message_handler_delegate.h

Index: ui/views/win/hwnd_message_handler_delegate.h
===================================================================
--- ui/views/win/hwnd_message_handler_delegate.h	(revision 244297)
+++ ui/views/win/hwnd_message_handler_delegate.h	(working copy)
@@ -234,6 +234,10 @@
                              WPARAM w_param,
                              LPARAM l_param) = 0;
 
+  // Called when a scroll event is received. Returns true if the event was
+  // handled by the delegate.
+  virtual bool HandleScrollEvent(const ui::ScrollEvent& event) = 0;
+
  protected:
   virtual ~HWNDMessageHandlerDelegate() {}
 };