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

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

Issue 11761005: views: Target the synthetic wheel events to the view under the mouse cursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aura-test Created 7 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/controls/menu/menu_host_root_view.cc ('k') | ui/views/widget/root_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 3eff315cdd94f623d618ef8cdb0c30b72611be3f..1bc65ba35b18ceebbbab8ec7dd6d134d92d5c21c 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -799,18 +799,6 @@ void NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
}
void NativeWidgetAura::OnScrollEvent(ui::ScrollEvent* event) {
- if (event->type() == ui::ET_SCROLL) {
- delegate_->OnScrollEvent(event);
- if (event->handled())
- return;
-
- // Convert unprocessed scroll events into wheel events.
- ui::MouseWheelEvent mwe(*static_cast<ui::ScrollEvent*>(event));
- delegate_->OnMouseEvent(&mwe);
- if (mwe.handled())
- event->SetHandled();
- return;
- }
delegate_->OnScrollEvent(event);
}
« no previous file with comments | « ui/views/controls/menu/menu_host_root_view.cc ('k') | ui/views/widget/root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698