| Index: webkit/tools/test_shell/webwidget_host_win.cc
|
| ===================================================================
|
| --- webkit/tools/test_shell/webwidget_host_win.cc (revision 70263)
|
| +++ webkit/tools/test_shell/webwidget_host_win.cc (working copy)
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "webkit/tools/test_shell/webwidget_host.h"
|
|
|
| +#include "app/win/hwnd_util.h"
|
| #include "base/logging.h"
|
| -#include "base/win_util.h"
|
| #include "gfx/rect.h"
|
| #include "skia/ext/platform_canvas.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
|
| @@ -52,7 +52,7 @@
|
| kWindowClassName, kWindowClassName, WS_POPUP,
|
| 0, 0, 0, 0,
|
| parent_view, NULL, GetModuleHandle(NULL), NULL);
|
| - win_util::SetWindowUserData(host->view_, host);
|
| + app::win::SetWindowUserData(host->view_, host);
|
|
|
| host->webwidget_ = WebPopupMenu::create(client);
|
|
|
| @@ -60,7 +60,7 @@
|
| }
|
|
|
| static WebWidgetHost* FromWindow(HWND view) {
|
| - return reinterpret_cast<WebWidgetHost*>(win_util::GetWindowUserData(view));
|
| + return reinterpret_cast<WebWidgetHost*>(app::win::GetWindowUserData(view));
|
| }
|
|
|
| /*static*/
|
| @@ -205,7 +205,7 @@
|
| }
|
|
|
| WebWidgetHost::~WebWidgetHost() {
|
| - win_util::SetWindowUserData(view_, 0);
|
| + app::win::SetWindowUserData(view_, 0);
|
|
|
| TrackMouseLeave(false);
|
|
|
|
|