diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-14 03:00:30 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-14 03:00:30 +0000 |
| commit | 672eca0fd191acd39c28430d1ed1f327594faff8 (patch) | |
| tree | 56d0070a11a25756240d0a3088458dd7a7fad32d /webkit/tools/test_shell/foreground_helper.h | |
| parent | f4078cf39908bfada67c0614ffc5ee8e4af765a2 (diff) | |
| download | chromium_src-672eca0fd191acd39c28430d1ed1f327594faff8.zip chromium_src-672eca0fd191acd39c28430d1ed1f327594faff8.tar.gz chromium_src-672eca0fd191acd39c28430d1ed1f327594faff8.tar.bz2 | |
Reverting 23406.
It seems that Tab2OutOfTabStrip is failing consistently after this change.
BUG=None
TEST=None
TBR=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/164543
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/foreground_helper.h')
| -rw-r--r-- | webkit/tools/test_shell/foreground_helper.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/foreground_helper.h b/webkit/tools/test_shell/foreground_helper.h index a687c0d..9456ded 100644 --- a/webkit/tools/test_shell/foreground_helper.h +++ b/webkit/tools/test_shell/foreground_helper.h @@ -38,16 +38,16 @@ class ForegroundHelper : public base::WindowImpl { // be in the foreground and allowed to move the target window // into the foreground too. - set_window_style(WS_POPUP); + set_window_ex_style(WS_POPUP); Init(NULL, gfx::Rect()); static const int hotkey_id = 0x0000baba; // Store the target window into our USERDATA for use in our // HotKey handler. - SetWindowLongPtr(hwnd(), GWLP_USERDATA, + SetWindowLongPtr(GetNativeView(), GWLP_USERDATA, reinterpret_cast<ULONG_PTR>(window)); - RegisterHotKey(hwnd(), hotkey_id, 0, VK_F22); + RegisterHotKey(GetNativeView(), hotkey_id, 0, VK_F22); // If the calling thread is not yet a UI thread, call PeekMessage // to ensure creation of its message queue. @@ -72,8 +72,8 @@ class ForegroundHelper : public base::WindowImpl { break; } - UnregisterHotKey(hwnd(), hotkey_id); - DestroyWindow(hwnd()); + UnregisterHotKey(GetNativeView(), hotkey_id); + DestroyWindow(); return S_OK; } @@ -83,7 +83,7 @@ class ForegroundHelper : public base::WindowImpl { WPARAM wparam, LPARAM lparam, BOOL& handled) { - HWND window = reinterpret_cast<HWND>(GetWindowLongPtr(hwnd(), + HWND window = reinterpret_cast<HWND>(GetWindowLongPtr(GetNativeView(), GWLP_USERDATA)); SetForegroundWindow(window); return 1; |