diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 19:30:06 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 19:30:06 +0000 |
| commit | 39e556928470ab6b8fc25b8a04f68a66941ffcf2 (patch) | |
| tree | b07eacb389ae2afbf21eb81b1a606df99a75104f /ui/base/win/foreground_helper.h | |
| parent | eb25b03c4711eb37c0d4119501bd10caf7d9686d (diff) | |
| download | chromium_src-39e556928470ab6b8fc25b8a04f68a66941ffcf2.zip chromium_src-39e556928470ab6b8fc25b8a04f68a66941ffcf2.tar.gz chromium_src-39e556928470ab6b8fc25b8a04f68a66941ffcf2.tar.bz2 | |
Revert 123771 - Refactor out foreground_help to fix BringBrowserWindowToFront on Windows
Refactor out foreground_helper so that regular Chromium tests can use it. Use
it in ShowAndFocusNativeWindow to make sure the browser window is in front,
both when tests ask and when trying to send keyboard events. This should reduce
some flakiness of related tests, and certainly makes it easier to debug those
tests.
The API for SendKeyPress events looks like it changed long ago to add a target
window, only the Windows code simply dropped that on the floor. By returning
false when the event wouldn't go to the right place, it allows for
ui_test_utils::SendKeyPressSync to bring the browser window to the front and
try again.
BUG=106489
TEST=Run browser_tests or interactive_ui_tests and bring another window to the
front. For the tests in question, the browser should now pop in front when it
needs to for the test to complete properly.
Review URL: http://codereview.chromium.org/9431050
TBR=scottbyer@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9474010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/win/foreground_helper.h')
| -rw-r--r-- | ui/base/win/foreground_helper.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/ui/base/win/foreground_helper.h b/ui/base/win/foreground_helper.h deleted file mode 100644 index a630828..0000000 --- a/ui/base/win/foreground_helper.h +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef UI_BASE_WIN_FOREGROUND_HELPER_H_ -#define UI_BASE_WIN_FOREGROUND_HELPER_H_ -#pragma once - -#include "base/logging.h" -#include "ui/base/win/window_impl.h" - -namespace ui { - -// Helper class for moving a window to the foreground. -// Windows XP and later will not allow a window which is in the background to -// move to the foreground, unless requested by the current window in the -// foreground. For automated testing, we really want some of our windows -// to be capable of moving to the foreground. -// -// This is probably leveraging a windows bug. -class UI_EXPORT ForegroundHelper : public WindowImpl { - public: - ForegroundHelper() : window_(NULL) { } - - BEGIN_MSG_MAP_EX(ForegroundHelper) - MESSAGE_HANDLER(WM_HOTKEY, OnHotKey) - END_MSG_MAP() - - // Brings a window into the foreground. - // Can be called from any window, even if the caller is not the - // foreground window. - static HRESULT SetForeground(HWND window); - - private: - HRESULT ForegroundHotKey(HWND window); - - // Handle the registered Hotkey being pressed. - LRESULT OnHotKey(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); - - HWND window_; - - DISALLOW_COPY_AND_ASSIGN(ForegroundHelper); -}; - -} // namespace ui - -#endif // UI_BASE_WIN_FOREGROUND_HELPER_H_ |