| Index: content/browser/web_contents/web_contents_view_win.cc
|
| ===================================================================
|
| --- content/browser/web_contents/web_contents_view_win.cc (revision 163514)
|
| +++ content/browser/web_contents/web_contents_view_win.cc (working copy)
|
| @@ -19,12 +19,6 @@
|
| #include "ui/base/win/hwnd_subclass.h"
|
| #include "ui/gfx/screen.h"
|
|
|
| -using content::RenderViewHost;
|
| -using content::RenderWidgetHostView;
|
| -using content::RenderWidgetHostViewWin;
|
| -using content::WebContents;
|
| -using content::WebContentsViewDelegate;
|
| -
|
| namespace content {
|
| WebContentsView* CreateWebContentsView(
|
| WebContentsImpl* web_contents,
|
| @@ -34,7 +28,6 @@
|
| *render_view_host_delegate_view = rv;
|
| return rv;
|
| }
|
| -}
|
|
|
| namespace {
|
|
|
| @@ -120,14 +113,14 @@
|
| RevokeDragDrop(GetNativeView());
|
| drag_dest_ = new WebDragDest(hwnd(), web_contents_);
|
| if (delegate_.get()) {
|
| - content::WebDragDestDelegate* delegate = delegate_->GetDragDestDelegate();
|
| + WebDragDestDelegate* delegate = delegate_->GetDragDestDelegate();
|
| if (delegate)
|
| drag_dest_->set_delegate(delegate);
|
| }
|
| }
|
|
|
| RenderWidgetHostView* WebContentsViewWin::CreateViewForWidget(
|
| - content::RenderWidgetHost* render_widget_host) {
|
| + RenderWidgetHost* render_widget_host) {
|
| if (render_widget_host->GetView()) {
|
| // During testing, the view will already be set up in most cases to the
|
| // test view, so we don't want to clobber it with a real one. To verify that
|
| @@ -250,8 +243,8 @@
|
| }
|
|
|
| void WebContentsViewWin::ShowContextMenu(
|
| - const content::ContextMenuParams& params,
|
| - content::ContextMenuSourceType type) {
|
| + const ContextMenuParams& params,
|
| + ContextMenuSourceType type) {
|
| if (delegate_.get())
|
| delegate_->ShowContextMenu(params, type);
|
| }
|
| @@ -483,3 +476,5 @@
|
|
|
| return 1;
|
| }
|
| +
|
| +} // namespace content
|
|
|