Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Unified Diff: ui/views/win/hwnd_message_handler.cc

Issue 13003004: Support multi touch on Windows 8 AURA and ASH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/metro_viewer/metro_viewer_messages.h ('k') | win8/metro_driver/chrome_app_view_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/win/hwnd_message_handler.cc
===================================================================
--- ui/views/win/hwnd_message_handler.cc (revision 190807)
+++ ui/views/win/hwnd_message_handler.cc (working copy)
@@ -12,6 +12,7 @@
#include "base/win/windows_version.h"
#include "ui/base/events/event.h"
#include "ui/base/events/event_utils.h"
+#include "ui/base/gestures/gesture_sequence.h"
#include "ui/base/keycodes/keyboard_code_conversion_win.h"
#include "ui/base/win/hwnd_util.h"
#include "ui/base/win/mouse_wheel_util.h"
@@ -292,10 +293,6 @@
// The thickness of an auto-hide taskbar in pixels.
const int kAutoHideTaskbarThicknessPx = 2;
-// The touch id to be used for touch events coming in from Windows Aura
-// Desktop.
-const int kDesktopChromeAuraTouchId = 9;
-
// For windows with the standard frame removed, the client area needs to be
// different from the window area to avoid a "feature" in Windows's handling of
// WM_NCCALCSIZE data. See the comment near the bottom of GetClientAreaInsets
@@ -2003,7 +2000,7 @@
ui::TouchEvent event(
touch_event_type,
gfx::Point(point.x, point.y),
- kDesktopChromeAuraTouchId,
+ input[i].dwID % ui::GestureSequence::kMaxGesturePoints,
base::TimeDelta::FromMilliseconds(input[i].dwTime));
delegate_->HandleTouchEvent(event);
}
« no previous file with comments | « ui/metro_viewer/metro_viewer_messages.h ('k') | win8/metro_driver/chrome_app_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698