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

ui/views/controls/native_control_win.cc

 // 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.
 
 #include "ui/views/controls/native_control_win.h"
 
 #include <windowsx.h>
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessibility_types.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/controls/combobox/combobox.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
 
 using ui::ViewProp;
 
 const char kNativeControlWinKey[] = "__NATIVE_CONTROL_WIN__";
 
 namespace views {
 
@@ skipping 108 matching lines @@
   }
 }
 
 void NativeControlWin::NativeControlCreated(HWND native_control) {
   // Associate this object with the control's HWND so that NativeWidgetWin can
   // find this object when it receives messages from it.
   props_.push_back(new ViewProp(native_control, kNativeControlWinKey, this));
   props_.push_back(ChildWindowMessageProcessor::Register(native_control, this));
 
   // Subclass so we get WM_KEYDOWN and WM_SETFOCUS messages.
-  original_wndproc_ = ui::SetWindowProc(
+  original_wndproc_ = gfx::SetWindowProc(
       native_control, &NativeControlWin::NativeControlWndProc);
 
   Attach(native_control);
   // native_view() is now valid.
 
   // Update the newly created HWND with any resident enabled state.
   EnableWindow(native_view(), enabled());
 
   // This message ensures that the focus border is shown.
   SendMessage(native_view(), WM_CHANGEUISTATE,
@@ skipping 56 matching lines @@
   } else if (message == WM_SETFOCUS) {
     // Let the focus manager know that the focus changed.
     FocusManager* focus_manager = native_control->GetFocusManager();
     if (focus_manager) {
       focus_manager->SetFocusedView(native_control->focus_view());
     } else {
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
     native_control->props_.clear();
-    ui::SetWindowProc(window, native_control->original_wndproc_);
+    gfx::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views