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

Unified Diff: ui/views/widget/native_widget_win.cc

Issue 133053004: Ensure that trackpad and trackpoint scrolling works on Windows desktop Aura with legacy trackpad dr… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 11 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/views/widget/native_widget_win.h ('k') | ui/views/win/hwnd_message_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_win.cc
===================================================================
--- ui/views/widget/native_widget_win.cc (revision 244237)
+++ ui/views/widget/native_widget_win.cc (working copy)
@@ -769,7 +769,6 @@
delegate_->OnMouseEvent(&dpi_event);
return dpi_event.handled();
} else if (event.IsMouseEvent()) {
- CHECK(!event.IsScrollEvent()); // Scroll events don't happen in Windows.
ui::MouseEvent dpi_event(event);
if (!(dpi_event.flags() & ui::EF_IS_NON_CLIENT))
dpi_event.UpdateForRootTransform(scale_transform);
@@ -867,6 +866,11 @@
LPARAM l_param) {
}
+bool NativeWidgetWin::HandleScrollEvent(const ui::ScrollEvent& event) {
+ delegate_->OnScrollEvent(const_cast<ui::ScrollEvent*>(&event));
+ return event.handled();
+}
+
////////////////////////////////////////////////////////////////////////////////
// NativeWidgetWin, private:
« no previous file with comments | « ui/views/widget/native_widget_win.h ('k') | ui/views/win/hwnd_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698