Move a bunch of windows stuff from ui/base/win to ui/gfx/win

content/browser/web_contents/web_contents_view_win.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "base/win/win_util.h"
 #include "content/common/content_export.h"
 #include "content/common/drag_event_source_info.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/port/browser/web_contents_view_port.h"
-#include "ui/base/win/window_impl.h"
+#include "ui/gfx/win/window_impl.h"
 
 namespace ui {
 class HWNDMessageFilter;
 }
 
 namespace content {
 class WebContentsDragWin;
 class WebContentsImpl;
 class WebContentsViewDelegate;
 class WebDragDest;
 
 // An implementation of WebContentsView for Windows.
 class CONTENT_EXPORT WebContentsViewWin
     : public WebContentsViewPort,
       public RenderViewHostDelegateView,
-      public ui::WindowImpl {
+      public gfx::WindowImpl {
  public:
   WebContentsViewWin(WebContentsImpl* web_contents,
                      WebContentsViewDelegate* delegate);
   virtual ~WebContentsViewWin();
 
   BEGIN_MSG_MAP_EX(WebContentsViewWin)
     MESSAGE_HANDLER(WM_CREATE, OnCreate)
     MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
     MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged)
     MESSAGE_HANDLER(WM_LBUTTONDOWN, OnMouseDown)
@@ skipping 95 matching lines @@
   scoped_refptr<WebContentsDragWin> drag_handler_;
 
   scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewWin);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_