diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 20:39:10 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 20:39:10 +0000 |
| commit | 5fbf4f188d74229eeb6a34b217266f28e05c8c5f (patch) | |
| tree | 293d4063d3f3c673ae29723c953ab865b5476a68 /content | |
| parent | 801df8f5a6aa7370d097bff2db11d6692676d556 (diff) | |
| download | chromium_src-5fbf4f188d74229eeb6a34b217266f28e05c8c5f.zip chromium_src-5fbf4f188d74229eeb6a34b217266f28e05c8c5f.tar.gz chromium_src-5fbf4f188d74229eeb6a34b217266f28e05c8c5f.tar.bz2 | |
Move the mouse wheel utils from views to ui\base\win, to get rid of some views dependencies in content.
Review URL: http://codereview.chromium.org/7753025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index de502e9..2ee0751 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -47,13 +47,13 @@ #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/focus/focus_manager.h" -#include "views/focus/focus_util_win.h" #include "views/widget/widget.h" #include "webkit/glue/webaccessibility.h" #include "webkit/glue/webcursor.h" @@ -807,7 +807,7 @@ LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) { 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))); @@ -1401,7 +1401,7 @@ LRESULT RenderWidgetHostViewWin::OnWheelEvent(UINT message, WPARAM wparam, // 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; } |