views-desktop: Fix sending mousewheel events to the correct view.

views/desktop/desktop_window_view.cc

 // Copyright (c) 2011 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 "views/desktop/desktop_window_view.h"
 
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/transform.h"
 #include "views/desktop/desktop_background.h"
 #include "views/desktop/desktop_window_root_view.h"
@@ skipping 26 matching lines @@
   virtual internal::RootView* CreateRootView() OVERRIDE {
     return new DesktopWindowRootView(desktop_window_view_, this);
   }
 
   virtual bool OnKeyEvent(const KeyEvent& event) OVERRIDE {
     NativeWidgetViews* native_widget =
         desktop_window_view_->active_native_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);
 };
 
 class TestWindowContentView : public WidgetDelegateView {
  public:
   TestWindowContentView(const std::wstring& title, SkColor color)
       : title_(title),
         color_(color) {
@@ skipping 201 matching lines @@
       active_native_widget_->GetWidget()->Deactivate();
     active_native_widget_ =
         static_cast<NativeWidgetViews*>(widget->native_widget());
   } else if (widget == active_native_widget_->GetWidget()) {
     active_native_widget_ = NULL;
   }
 }
 
 }  // namespace desktop
 }  // namespace views