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

Unified Diff: views/desktop/desktop_window_view.cc

Issue 7462017: views-desktop: Fix sending mousewheel events to the correct view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/desktop/desktop_window_view.cc
diff --git a/views/desktop/desktop_window_view.cc b/views/desktop/desktop_window_view.cc
index 95aa1598e836e17a2d076632bdf2c76a97b3aa3b..67abf6014c1e251f8d5de0e475a42b562b1abe54 100644
--- a/views/desktop/desktop_window_view.cc
+++ b/views/desktop/desktop_window_view.cc
@@ -44,6 +44,16 @@ class DesktopWindow : public Widget {
return native_widget ? native_widget->OnKeyEvent(event) : false;
}
+ virtual bool OnMouseEvent(const MouseEvent& event) {
sky 2011/08/17 15:50:35 OVERRIDE
+ if (event.type() == ui::ET_MOUSEWHEEL) {
+ NativeWidgetViews* native_widget =
+ desktop_window_view_->active_native_widget();
+ if (native_widget)
+ return native_widget->delegate()->OnMouseEvent(event);
+ }
+ return Widget::OnMouseEvent(event);
+ }
+
DesktopWindowView* desktop_window_view_;
DISALLOW_COPY_AND_ASSIGN(DesktopWindow);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698