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 e0a804cb8c9856ab729936fb19489f13d1002ad6..3995f3cce811beb4ab0775cb95ed2b829d8e9993 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); |
@@ -697,6 +704,8 @@ class VIEWS_EXPORT HWNDMessageHandler : |
// fullscreen window which lost activation. Defaults to false. |
bool background_fullscreen_hack_; |
+ bool is_pointer_in_range_; |
+ |
// This is a map of the HMONITOR to full screeen window instance. It is safe |
// to keep a raw pointer to the HWNDMessageHandler instance as we track the |
// window destruction and ensure that the map is cleaned up. |