Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 7753025: Move the mouse wheel utils from views to ui\base\win, to get rid of some views dependencies in co... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_win.cc ('k') | ui/base/win/mouse_wheel_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_win.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_win.cc (revision 98345)
+++ content/browser/renderer_host/render_widget_host_view_win.cc (working copy)
@@ -46,6 +46,7 @@
#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"
@@ -53,7 +54,6 @@
#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"
@@ -808,7 +808,7 @@
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)));
@@ -1402,7 +1402,7 @@
// 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;
}
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_win.cc ('k') | ui/base/win/mouse_wheel_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698