Move UI-relevant Windows files to ui/base.

views/widget/widget_win.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 "views/widget/widget_win.h"
 
 #include "app/l10n_util_win.h"
 #include "app/view_prop.h"
-#include "app/win/hwnd_util.h"
 #include "app/win/win_util.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
 #include "gfx/path.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/system_monitor/system_monitor.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
 #include "views/focus/focus_util_win.h"
 #include "views/views_delegate.h"
 #include "views/widget/aero_tooltip_manager.h"
 #include "views/widget/child_window_message_processor.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/drop_target_win.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_delegate.h"
@@ skipping 44 matching lines @@
 WidgetWin::~WidgetWin() {
 }
 
 // static
 WidgetWin* WidgetWin::GetWidget(HWND hwnd) {
   // TODO(jcivelli): http://crbug.com/44499 We need a way to test that hwnd is
   //                 associated with a WidgetWin (it might be a pure
   //                 WindowImpl).
   if (!WindowImpl::IsWindowImpl(hwnd))
     return NULL;
-  return reinterpret_cast<WidgetWin*>(app::win::GetWindowUserData(hwnd));
+  return reinterpret_cast<WidgetWin*>(ui::GetWindowUserData(hwnd));
 }
 
 // static
 WidgetWin* WidgetWin::GetRootWidget(HWND hwnd) {
   // First, check if the top-level window is a Widget.
   HWND root = ::GetAncestor(hwnd, GA_ROOT);
   if (!root)
     return NULL;
 
   WidgetWin* widget = WidgetWin::GetWidget(root);
@@ skipping 1011 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // WidgetWin, private:
 
 // static
 Window* WidgetWin::GetWindowImpl(HWND hwnd) {
   // NOTE: we can't use GetAncestor here as constrained windows are a Window,
   // but not a top level window.
   HWND parent = hwnd;
   while (parent) {
     WidgetWin* widget =
-        reinterpret_cast<WidgetWin*>(app::win::GetWindowUserData(parent));
+        reinterpret_cast<WidgetWin*>(ui::GetWindowUserData(parent));
     if (widget && widget->is_window_)
       return static_cast<WindowWin*>(widget);
     parent = ::GetParent(parent);
   }
   return NULL;
 }
 
 void WidgetWin::SizeContents(const gfx::Size& window_size) {
   contents_.reset(new gfx::CanvasSkia(window_size.width(),
                                       window_size.height(),
@@ skipping 236 matching lines @@
 Widget* Widget::GetWidgetFromNativeWindow(gfx::NativeWindow native_window) {
   return Widget::GetWidgetFromNativeView(native_window);
 }
 
 // static
 void Widget::NotifyLocaleChanged() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace views