Move UI-relevant Windows files to ui/base.

views/controls/menu/native_menu_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/menu/native_menu_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
-#include "app/win/hwnd_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 static const int kIconWidth = 23;
 // Margins between the top of the item and the label.
 static const int kItemTopMargin = 3;
@@ skipping 25 matching lines @@
 // A window that receives messages from Windows relevant to the native menu
 // structure we have constructed in NativeMenuWin.
 class NativeMenuWin::MenuHostWindow {
  public:
   MenuHostWindow(NativeMenuWin* parent)
       : parent_(parent),
         ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
     RegisterClass();
     hwnd_ = CreateWindowEx(l10n_util::GetExtendedStyles(), kWindowClassName,
                            L"", 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
-    app::win::SetWindowUserData(hwnd_, this);
+    ui::SetWindowUserData(hwnd_, this);
   }
 
   ~MenuHostWindow() {
     DestroyWindow(hwnd_);
   }
 
   HWND hwnd() const { return hwnd_; }
 
  private:
   static const wchar_t* kWindowClassName;
@@ skipping 197 matching lines @@
       // TODO(beng): bring over owner draw from old menu system.
     }
     return false;
   }
 
   static LRESULT CALLBACK MenuHostWindowProc(HWND window,
                                              UINT message,
                                              WPARAM w_param,
                                              LPARAM l_param) {
     MenuHostWindow* host =
-        reinterpret_cast<MenuHostWindow*>(app::win::GetWindowUserData(window));
+        reinterpret_cast<MenuHostWindow*>(ui::GetWindowUserData(window));
     // host is null during initial construction.
     LRESULT l_result = 0;
     if (!host || !host->ProcessWindowMessage(window, message, w_param, l_param,
                                              &l_result)) {
       return DefWindowProc(window, message, w_param, l_param);
     }
     return l_result;
   }
 
   HWND hwnd_;
@@ skipping 339 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views