Move UI-relevant Windows files to ui/base.

views/controls/native_control_win.cc

 // Copyright (c) 2010 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 "views/controls/native_control_win.h"
 
 #include <windowsx.h>
 
 #include "app/l10n_util_win.h"
-#include "app/win/hwnd_util.h"
 #include "app/view_prop.h"
 #include "base/logging.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/focus/focus_manager.h"
 
 using app::ViewProp;
 
 namespace views {
 
 static const char* const kNativeControlWinKey = "__NATIVE_CONTROL_WIN__";
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, public:
@@ skipping 106 matching lines @@
     View::ShowContextMenu(location, true);
 }
 
 void NativeControlWin::NativeControlCreated(HWND native_control) {
   // Associate this object with the control's HWND so that WidgetWin 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_ = app::win::SetWindowProc(
+  original_wndproc_ = ui::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(), IsEnabled());
 
   // 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_.reset();
-    app::win::SetWindowProc(window, native_control->original_wndproc_);
+    ui::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views