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

ui/views/controls/native_control.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.
 
 #include "ui/views/controls/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
 #include <atlmisc.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #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"
 #include "ui/views/widget/widget.h"
 
 using ui::ViewProp;
 
 namespace views {
 
 // Maps to the NativeControl.
@@ skipping 50 matching lines @@
     delete this;
   }
 
  private:
   friend class NativeControl;
 
   LRESULT OnCreate(LPCREATESTRUCT create_struct) {
     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_));
 
     ::ShowWindow(control_, SW_SHOW);
     return 1;
   }
 
   LRESULT OnEraseBkgnd(HDC dc) {
     return 1;
   }
@@ skipping 269 matching lines @@
     return 0;
   } 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);
     } else {
       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();
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views