| Index: ui/views/win/hwnd_message_handler.cc
|
| diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
| index 531b4881a52f56d1dfe62604a6999364b81b6fd9..e80de4ee6ab3aace2c8723087c836eb83613da3e 100644
|
| --- a/ui/views/win/hwnd_message_handler.cc
|
| +++ b/ui/views/win/hwnd_message_handler.cc
|
| @@ -8,7 +8,6 @@
|
| #include <oleacc.h>
|
| #include <shellapi.h>
|
| #include <tchar.h>
|
| -#include <tpcshrd.h>
|
|
|
| #include <utility>
|
|
|
| @@ -385,9 +384,7 @@ void HWNDMessageHandler::Init(HWND parent, const gfx::Rect& bounds) {
|
| direct_manipulation_helper_->Initialize(hwnd());
|
|
|
| // Disable pen flicks (http://crbug.com/506977)
|
| - ::SetProp(hwnd(), MICROSOFT_TABLETPENSERVICE_PROPERTY,
|
| - reinterpret_cast<HANDLE>(TABLET_DISABLE_FLICKS |
|
| - TABLET_DISABLE_FLICKFALLBACKKEYS));
|
| + base::win::AllowFlicks(hwnd(), false);
|
| }
|
|
|
| void HWNDMessageHandler::InitModalType(ui::ModalType modal_type) {
|
| @@ -414,9 +411,8 @@ void HWNDMessageHandler::Close() {
|
| // they can activate as foreground windows upon this window's destruction.
|
| RestoreEnabledIfNecessary();
|
|
|
| - // Remove the property which disables pen flicks (http://crbug.com/506977)
|
| - // for this window.
|
| - ::RemoveProp(hwnd(), MICROSOFT_TABLETPENSERVICE_PROPERTY);
|
| + // Re-enable flicks which removes the window property.
|
| + base::win::AllowFlicks(hwnd(), true);
|
|
|
| if (!waiting_for_close_now_) {
|
| // And we delay the close so that if we are called from an ATL callback,
|
|
|