Correct behaviour of touch wrt mouse capture.

ui/views/widget/native_widget_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 40 matching lines @@
 #include "ui/views/widget/widget_hwnd_utils.h"
 #include "ui/views/window/native_frame_view.h"
 
 #if !defined(USE_AURA)
 #include "base/command_line.h"
 #include "ui/base/ui_base_switches.h"
 #endif
 
 #pragma comment(lib, "dwmapi.lib")
 
-// From msdn:
-#define MOUSEEVENTF_FROMTOUCH 0xFF515700
-
 using ui::ViewProp;
 
 namespace views {
 
 namespace {
 
 // MoveLoopMouseWatcher is used to determine if the user canceled or completed a
 // move. win32 doesn't appear to offer a way to determine the result of a move,
 // so we install hooks to determine if we got a mouse up and assume the move
 // completed.
@@ skipping 1550 matching lines @@
     is_right_mouse_pressed_on_caption_ = true;
     // We SetCapture() to ensure we only show the menu when the button
     // down and up are both on the caption. Note: this causes the button up to
     // be WM_RBUTTONUP instead of WM_NCRBUTTONUP.
     SetCapture();
   }
 
   MSG msg = { hwnd(), message, w_param, l_param, 0,
               { GET_X_LPARAM(l_param), GET_Y_LPARAM(l_param) } };
   MouseEvent event(msg);
-  // Only button up/down have MOUSEEVENTF_FROMTOUCH set.
-  if (!touch_ids_.empty() ||
-      ((message == WM_LBUTTONDOWN || message == WM_LBUTTONUP ||
-        message == WM_RBUTTONDOWN || message == WM_RBUTTONUP) &&
-       (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) ==
-       MOUSEEVENTF_FROMTOUCH)) {
+  if (!touch_ids_.empty() || base::win::IsMouseEventFromTouch(message)) {

[flackr, 2012/07/24 19:53:04]

nit: no braces for single line if statement.

[girard, 2012/07/24 23:54:55]

Done.

     event.set_flags(event.flags() | ui::EF_FROM_TOUCH);
   }
 
   if (!(event.flags() & ui::EF_IS_NON_CLIENT))
     if (tooltip_manager_.get())
       tooltip_manager_->OnMouse(message, w_param, l_param);
 
   if (event.type() == ui::ET_MOUSE_MOVED && !HasCapture()) {
     // Windows only fires WM_MOUSELEAVE events if the application begins
     // "tracking" mouse events for a given HWND during WM_MOUSEMOVE events.
@@ skipping 1117 matching lines @@
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   // This currently isn't necessary because we're not generating touch events on
   // windows.  When we do, this will need to be updated.
   return false;
 }
 
 }  // namespace internal
 
 }  // namespace views