Index: views/controls/menu/native_menu_win.cc |
=================================================================== |
--- views/controls/menu/native_menu_win.cc (revision 71828) |
+++ views/controls/menu/native_menu_win.cc (working copy) |
@@ -6,7 +6,6 @@ |
#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" |
@@ -15,6 +14,7 @@ |
#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" |
@@ -60,7 +60,7 @@ |
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() { |
@@ -278,7 +278,7 @@ |
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, |