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

ui/views/controls/native_control.cc

Index: ui/views/controls/native_control.cc
diff --git a/ui/views/controls/native_control.cc b/ui/views/controls/native_control.cc
index e6219e74a1cb4976b5b334d64618e22cf7af73b0..e4504633989fb90b4336bd2ee9243ff39dbf4acb 100644
--- a/ui/views/controls/native_control.cc
+++ b/ui/views/controls/native_control.cc
@@ -17,7 +17,7 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
-#include "ui/base/win/hwnd_util.h"
+#include "ui/gfx/win/hwnd_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/focus/focus_manager.h"
@@ -88,7 +88,7 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer,
     control_ = parent_->CreateNativeControl(m_hWnd);
 
     // We subclass the control hwnd so we get the WM_KEYDOWN messages.
-    original_handler_ = ui::SetWindowProc(
+    original_handler_ = gfx::SetWindowProc(
         control_, &NativeControl::NativeControlWndProc);
     prop_.reset(new ViewProp(control_, kNativeControlKey , parent_));
 
@@ -378,7 +378,7 @@ LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window,
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
-    ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler));
+    gfx::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler));
     native_control->container_->prop_.reset();
   }