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

views/controls/textfield/native_textfield_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.
 
 #include "views/controls/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "grit/ui_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/range/range.h"
+#include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/native_theme_win.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/focus/focus_manager.h"
-#include "views/focus/focus_util_win.h"
 #include "views/metrics.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // Helper classes
 
 NativeTextfieldWin::ScopedFreeze::ScopedFreeze(NativeTextfieldWin* edit,
@@ skipping 698 matching lines @@
 
 void NativeTextfieldWin::OnMouseLeave() {
   SetContainsMouse(false);
 }
 
 LRESULT NativeTextfieldWin::OnMouseWheel(UINT message,
                                          WPARAM w_param,
                                          LPARAM l_param) {
   // Reroute the mouse-wheel to the window under the mouse pointer if
   // applicable.
-  if (views::RerouteMouseWheel(m_hWnd, w_param, l_param))
+  if (ui::RerouteMouseWheel(m_hWnd, w_param, l_param))
     return 0;
   return DefWindowProc(message, w_param, l_param);
 }
 
 void NativeTextfieldWin::OnMouseMove(UINT keys, const CPoint& point) {
   SetContainsMouse(true);
   // Clamp the selection to the visible text so the user can't drag to select
   // the "phantom newline".  In theory we could achieve this by clipping the X
   // coordinate, but in practice the edit seems to behave nondeterministically
   // with similar sequences of clipped input coordinates fed to it.  Maybe it's
@@ skipping 386 matching lines @@
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (views::Widget::IsPureViews())
     return new NativeTextfieldViews(field);
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views