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

chrome/browser/ui/views/omnibox/omnibox_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.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 30 matching lines @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/drop_target.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_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/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/textfield/native_textfield_win.h"
 #include "views/drag_utils.h"
 #include "views/events/event_utils_win.h"
-#include "views/focus/focus_util_win.h"
 #include "views/widget/widget.h"
 
 #pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
 #pragma comment(lib, "riched20.lib")  // Needed for the richedit control.
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditModel
 
 namespace {
 
@@ skipping 1739 matching lines @@
 }
 
 void OmniboxViewWin::OnWindowPosChanging(WINDOWPOS* window_pos) {
   if (force_hidden_)
     window_pos->flags &= ~SWP_SHOWWINDOW;
   SetMsgHandled(true);
 }
 
 BOOL OmniboxViewWin::OnMouseWheel(UINT flags, short delta, CPoint point) {
   // Forward the mouse-wheel message to the window under the mouse.
-  if (!views::RerouteMouseWheel(m_hWnd, MAKEWPARAM(flags, delta),
-                                MAKELPARAM(point.x, point.y)))
+  if (!ui::RerouteMouseWheel(m_hWnd, MAKEWPARAM(flags, delta),
+                             MAKELPARAM(point.x, point.y)))
     SetMsgHandled(false);
   return 0;
 }
 
 void OmniboxViewWin::HandleKeystroke(UINT message,
                                      TCHAR key,
                                      UINT repeat_count,
                                      UINT flags) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
@@ skipping 771 matching lines @@
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
 
 bool OmniboxViewWin::IsCaretAtEnd() const {
   long length = GetTextLength();
   CHARRANGE sel;
   GetSelection(sel);
   return sel.cpMin == sel.cpMax && sel.cpMin == length;
 }