Remove some views depenencies from RenderWidgetHostViewWin.

Review URL: http://codereview.chromium.org/7753021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98431 0039d316-1c4b-4281-b951-d872f2087c98

base/win/win_util.h

@@ -37,6 +37,14 @@ typedef _tagpropertykey PROPERTYKEY;
 namespace base {
 namespace win {
 
+// A Windows message reflected from other windows. This message is sent
+// with the following arguments:
+// hWnd - Target window
+// uMsg - kReflectedMessage
+// wParam - Should be 0
+// lParam - Pointer to MSG struct containing the original message.
+const int kReflectedMessage = WM_APP + 3;
+
 BASE_EXPORT void GetNonClientMetrics(NONCLIENTMETRICS* metrics);
 
 // Returns the string representing the current user sid.

content/browser/renderer_host/render_widget_host_view_win.cc

@@ -21,6 +21,7 @@
 #include "base/threading/thread.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_gdi_object.h"
+#include "base/win/win_util.h"
 #include "base/win/wrapped_window_proc.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state.h"
@@ -51,11 +52,9 @@
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
 #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 "views/widget/widget.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
@@ -1432,7 +1431,7 @@ LRESULT RenderWidgetHostViewWin::OnWheelEvent(UINT message, WPARAM wparam,
     new_message.lParam = lparam;
 
     handled_by_TabContents =
-        !!::SendMessage(GetParent(), views::kReflectedMessage, 0,
+        !!::SendMessage(GetParent(), base::win::kReflectedMessage, 0,
                         reinterpret_cast<LPARAM>(&new_message));
   }
 

views/widget/native_widget_win.h

@@ -19,6 +19,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/win/scoped_comptr.h"
+#include "base/win/win_util.h"
 #include "ui/base/win/window_impl.h"
 #include "views/focus/focus_manager.h"
 #include "views/layout/layout_manager.h"
@@ -52,14 +53,6 @@ VIEWS_EXPORT void EnsureRectIsVisibleInRect(const gfx::Rect& parent_rect,
                                             int padding);
 }  // namespace internal
 
-// A Windows message reflected from other windows. This message is sent
-// with the following arguments:
-// hWnd - Target window
-// uMsg - kReflectedMessage
-// wParam - Should be 0
-// lParam - Pointer to MSG struct containing the original message.
-const int kReflectedMessage = WM_APP + 3;
-
 // These two messages aren't defined in winuser.h, but they are sent to windows
 // with captions. They appear to paint the window caption and frame.
 // Unfortunately if you override the standard non-client rendering as we do
@@ -296,7 +289,7 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl,
     MESSAGE_RANGE_HANDLER_EX(WM_NCMOUSEMOVE, WM_NCXBUTTONDBLCLK, OnMouseRange)
 
     // Reflected message handler
-    MESSAGE_HANDLER_EX(kReflectedMessage, OnReflectedMessage)
+    MESSAGE_HANDLER_EX(base::win::kReflectedMessage, OnReflectedMessage)
 
     // CustomFrameWindow hacks
     MESSAGE_HANDLER_EX(WM_NCUAHDRAWCAPTION, OnNCUAHDrawCaption)