Move the mouse wheel utils from views to ui\base\win, to get rid of some views dependencies in co...

content/browser/renderer_host/render_widget_host_view_win.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.
 
 // Need Win 7 headers for WM_GESTURE and ChangeWindowMessageFilterEx
 // TODO(jschuh): See crbug.com/92941 for longterm fix.
 #undef  WINVER
 #define WINVER _WIN32_WINNT_WIN7
 #undef  _WIN32_WINNT
 #define _WIN32_WINNT _WIN32_WINNT_WIN7
@@ skipping 28 matching lines @@
 #include "content/common/view_messages.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "views/accessibility/native_view_accessibility_win.h"
 #include "views/focus/focus_manager.h"
-#include "views/focus/focus_util_win.h"
 // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
 #include "views/widget/native_widget_win.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
@@ skipping 734 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, private:
 
 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale
   // of a browser process.
   OnInputLangChange(0, 0);
   // Marks that window as supporting mouse-wheel messages rerouting so it is
   // scrolled when under the mouse pointer even if inactive.
-  props_.push_back(views::SetWindowSupportsRerouteMouseWheel(m_hWnd));
+  props_.push_back(ui::SetWindowSupportsRerouteMouseWheel(m_hWnd));
   props_.push_back(new ViewProp(m_hWnd, kRenderWidgetHostViewKey,
                                 static_cast<RenderWidgetHostView*>(this)));
 
   return 0;
 }
 
 void RenderWidgetHostViewWin::OnActivate(UINT action, BOOL minimized,
                                          HWND window) {
   // If the container is a popup, clicking elsewhere on screen should close the
   // popup.
@@ skipping 573 matching lines @@
         NativeWebKeyboardEvent(m_hWnd, message, wparam, lparam));
   }
   return 0;
 }
 
 LRESULT RenderWidgetHostViewWin::OnWheelEvent(UINT message, WPARAM wparam,
                                               LPARAM lparam, BOOL& handled) {
   // Forward the mouse-wheel message to the window under the mouse if it belongs
   // to us.
   if (message == WM_MOUSEWHEEL &&
-      views::RerouteMouseWheel(m_hWnd, wparam, lparam)) {
+      ui::RerouteMouseWheel(m_hWnd, wparam, lparam)) {
     handled = TRUE;
     return 0;
   }
 
   // Workaround for Thinkpad mousewheel driver. We get mouse wheel/scroll
   // messages even if we are not in the foreground. So here we check if
   // we have any owned popup windows in the foreground and dismiss them.
   if (m_hWnd != GetForegroundWindow()) {
     HWND toplevel_hwnd = ::GetAncestor(m_hWnd, GA_ROOT);
     EnumThreadWindows(
@@ skipping 438 matching lines @@
                                                       DWORD ex_style) {
   parent_hwnd_ = parent_hwnd;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   // To show tooltip on popup window.(e.g. title in <select>)
   // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
   // Ensure the tooltip is created otherwise tooltips are never shown.
   EnsureTooltip();
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 }