Merge 244295 "Ensure that trackpad and trackpoint scrolling work..."

ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

 // Copyright (c) 2012 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 "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
 
 #include "base/win/metro.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 904 matching lines @@
                                             LPARAM l_param,
                                             LRESULT* result) {
   return false;
 }
 
 void DesktopRootWindowHostWin::PostHandleMSG(UINT message,
                                              WPARAM w_param,
                                              LPARAM l_param) {
 }
 
+bool DesktopWindowTreeHostWin::HandleScrollEvent(
+    const ui::ScrollEvent& event) {
+  return delegate_->OnHostScrollEvent(const_cast<ui::ScrollEvent*>(&event));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopRootWindowHostWin, private:
 
 Widget* DesktopRootWindowHostWin::GetWidget() {
   return native_widget_delegate_->AsWidget();
 }
 
 const Widget* DesktopRootWindowHostWin::GetWidget() const {
   return native_widget_delegate_->AsWidget();
 }
@@ skipping 31 matching lines @@
 
 // static
 DesktopRootWindowHost* DesktopRootWindowHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura) {
   return new DesktopRootWindowHostWin(native_widget_delegate,
                                       desktop_native_widget_aura);
 }
 
 }  // namespace views