| Index: ui/views/win/hwnd_message_handler.h
|
| diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
|
| index 2230e23a00d3d8dc496f518a4749a1d3894b74c8..f645b4997a06f7f5561614a1696e6c3e61a8f0c3 100644
|
| --- a/ui/views/win/hwnd_message_handler.h
|
| +++ b/ui/views/win/hwnd_message_handler.h
|
| @@ -235,7 +235,10 @@ class VIEWS_EXPORT HWNDMessageHandler :
|
| WPARAM w_param,
|
| LPARAM l_param,
|
| bool* handled) override;
|
| -
|
| + LRESULT HandlePointerMessage(unsigned int message,
|
| + WPARAM w_param,
|
| + LPARAM l_param,
|
| + bool* handled) override;
|
| LRESULT HandleScrollMessage(unsigned int message,
|
| WPARAM w_param,
|
| LPARAM l_param,
|
| @@ -358,6 +361,11 @@ class VIEWS_EXPORT HWNDMessageHandler :
|
|
|
| // Pointer events.
|
| CR_MESSAGE_HANDLER_EX(WM_POINTERACTIVATE, OnPointerActivate)
|
| + CR_MESSAGE_HANDLER_EX(WM_POINTERDOWN, OnPointerEvent)
|
| + CR_MESSAGE_HANDLER_EX(WM_POINTERUP, OnPointerEvent)
|
| + CR_MESSAGE_HANDLER_EX(WM_POINTERUPDATE, OnPointerEvent)
|
| + CR_MESSAGE_HANDLER_EX(WM_POINTERENTER, OnPointerEvent)
|
| + CR_MESSAGE_HANDLER_EX(WM_POINTERLEAVE, OnPointerEvent)
|
|
|
| // Key events.
|
| CR_MESSAGE_HANDLER_EX(WM_KEYDOWN, OnKeyEvent)
|
| @@ -423,7 +431,6 @@ class VIEWS_EXPORT HWNDMessageHandler :
|
| CR_MSG_WM_SIZE(OnSize)
|
| CR_MSG_WM_SYSCOMMAND(OnSysCommand)
|
| CR_MSG_WM_THEMECHANGED(OnThemeChanged)
|
| - CR_MSG_WM_TIMECHANGE(OnTimeChange)
|
| CR_MSG_WM_WINDOWPOSCHANGED(OnWindowPosChanged)
|
| CR_MSG_WM_WINDOWPOSCHANGING(OnWindowPosChanging)
|
| CR_END_MSG_MAP()
|
| @@ -460,6 +467,7 @@ class VIEWS_EXPORT HWNDMessageHandler :
|
| LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param);
|
| LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param);
|
| LRESULT OnPointerActivate(UINT message, WPARAM w_param, LPARAM l_param);
|
| + LRESULT OnPointerEvent(UINT message, WPARAM w_param, LPARAM l_param);
|
| void OnMove(const gfx::Point& point);
|
| void OnMoving(UINT param, const RECT* new_bounds);
|
| LRESULT OnNCActivate(UINT message, WPARAM w_param, LPARAM l_param);
|
| @@ -481,7 +489,6 @@ class VIEWS_EXPORT HWNDMessageHandler :
|
| void OnSize(UINT param, const gfx::Size& size);
|
| void OnSysCommand(UINT notification_code, const gfx::Point& point);
|
| void OnThemeChanged();
|
| - void OnTimeChange();
|
| LRESULT OnTouchEvent(UINT message, WPARAM w_param, LPARAM l_param);
|
| void OnWindowPosChanging(WINDOWPOS* window_pos);
|
| void OnWindowPosChanged(WINDOWPOS* window_pos);
|
|
|