| Index: ui/base/win/mouse_wheel_util.cc
|
| ===================================================================
|
| --- ui/base/win/mouse_wheel_util.cc (revision 98345)
|
| +++ ui/base/win/mouse_wheel_util.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "views/focus/focus_util_win.h"
|
| +#include "ui/base/win/mouse_wheel_util.h"
|
|
|
| #include <windowsx.h>
|
|
|
| @@ -10,10 +10,8 @@
|
| #include "ui/base/view_prop.h"
|
| #include "ui/base/win/hwnd_util.h"
|
|
|
| -using ui::ViewProp;
|
| +namespace ui {
|
|
|
| -namespace views {
|
| -
|
| // Property used to indicate the HWND supports having mouse wheel messages
|
| // rerouted to it.
|
| static const char* const kHWNDSupportMouseWheelRerouting =
|
| @@ -34,7 +32,7 @@
|
| }
|
|
|
| static bool IsCompatibleWithMouseWheelRedirection(HWND window) {
|
| - std::wstring class_name = ui::GetClassName(window);
|
| + std::wstring class_name = GetClassName(window);
|
| // Mousewheel redirection to comboboxes is a surprising and
|
| // undesireable user behavior.
|
| return !(class_name == L"ComboBox" ||
|
| @@ -42,7 +40,7 @@
|
| }
|
|
|
| static bool CanRedirectMouseWheelFrom(HWND window) {
|
| - std::wstring class_name = ui::GetClassName(window);
|
| + std::wstring class_name = GetClassName(window);
|
|
|
| // Older Thinkpad mouse wheel drivers create a window under mouse wheel
|
| // pointer. Detect if we are dealing with this window. In this case we
|
| @@ -118,4 +116,4 @@
|
| return false;
|
| }
|
|
|
| -} // namespace views
|
| +} // namespace ui
|
|
|