Remove some views depenencies from RenderWidgetHostViewWin.

Remove some views depenencies from RenderWidgetHostViewWin.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=98431

[Ben Goodger (Google), 2011-08-26 16:07:21]

LGTM

On Thu, Aug 25, 2011 at 5:44 PM, <jam@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Remove some views depenencies from RenderWidgetHostViewWin.
>
> Please review this at
http://codereview.chromium.**org/7753021/<http://codereview.chromium.org/7753...
>
> SVN Base: svn://chrome-svn/chrome/trunk/**src/
>
> Affected files:
>  M     base/win/win_util.h
>  M     content/browser/renderer_host/**render_widget_host_view_win.cc
>  M     views/widget/native_widget_**win.h
>
>
> Index: base/win/win_util.h
> ==============================**==============================**=======
> --- base/win/win_util.h (revision 98348)
> +++ base/win/win_util.h (working copy)
> @@ -37,6 +37,14 @@
>  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.
> Index: content/browser/renderer_host/**render_widget_host_view_win.cc
> ==============================**==============================**=======
> --- content/browser/renderer_host/**render_widget_host_view_win.cc
>  (revision 98348)
> +++ content/browser/renderer_host/**render_widget_host_view_win.cc
>  (working copy)
> @@ -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 @@
>     new_message.lParam = lparam;
>
>     handled_by_TabContents =
> -        !!::SendMessage(GetParent(), views::kReflectedMessage, 0,
> +        !!::SendMessage(GetParent(), base::win::kReflectedMessage, 0,
>                         reinterpret_cast<LPARAM>(&new_**message));
>   }
>
> Index: views/widget/native_widget_**win.h
> ==============================**==============================**=======
> --- views/widget/native_widget_**win.h    (revision 98348)
> +++ views/widget/native_widget_**win.h    (working copy)
> @@ -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 @@
>                                             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 @@
>     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)
>
>
>