Remove some views depenencies from RenderWidgetHostViewWin.

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Need Win 7 headers for WM_GESTURE and ChangeWindowMessageFilterEx
 // TODO(jschuh): See crbug.com/92941 for longterm fix.
 #undef  WINVER
 #define WINVER _WIN32_WINNT_WIN7
 #undef  _WIN32_WINNT
 #define _WIN32_WINNT _WIN32_WINNT_WIN7
 #include <windows.h>
 
 #include "content/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
 #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"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/backing_store_win.h"
 #include "content/browser/renderer_host/render_process_host.h"
@@ skipping 10 matching lines @@
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_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/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"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using ui::ViewProp;
 using WebKit::WebInputEvent;
@@ skipping 1356 matching lines @@
     // Use a special reflected message to break recursion. If we send
     // WM_MOUSEWHEEL, the focus manager subclass of web contents will
     // route it back here.
     MSG new_message = {0};
     new_message.hwnd = m_hWnd;
     new_message.message = message;
     new_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));
   }
 
   if (!handled_by_TabContents && render_widget_host_) {
     render_widget_host_->ForwardWheelEvent(
         WebInputEventFactory::mouseWheelEvent(m_hWnd, message, wparam,
                                               lparam));
   }
   handled = TRUE;
   return 0;
@@ skipping 408 matching lines @@
                                                       DWORD ex_style) {
   parent_hwnd_ = parent_hwnd;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   // To show tooltip on popup window.(e.g. title in <select>)
   // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
   // Ensure the tooltip is created otherwise tooltips are never shown.
   EnsureTooltip();
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 }