diff options
| author | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 21:17:57 +0000 |
|---|---|---|
| committer | suzhe@chromium.org <suzhe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 21:17:57 +0000 |
| commit | 853300a85cf5390d7e7e25fcf5acf391306c94f8 (patch) | |
| tree | 00d89c84c2855562fed93e64f04a3180eb70d99b /base/keyboard_code_conversion_gtk.cc | |
| parent | 7fdad3a542e60dd9426e103b813421f3d1b37b40 (diff) | |
| download | chromium_src-853300a85cf5390d7e7e25fcf5acf391306c94f8.zip chromium_src-853300a85cf5390d7e7e25fcf5acf391306c94f8.tar.gz chromium_src-853300a85cf5390d7e7e25fcf5acf391306c94f8.tar.bz2 | |
[Mac]Port browser_keyevents_browsertest.cc and browser_focus_uitest.cc to Mac.
This CL includes:
1. Implementation of ui_test_utils_mac.mm
2. Fix for ui_controls_mac.mm
3. Port browser_keyevents_browsertest.cc to Mac and add some new tests for Mac.
4. Partially port browser_focus_uitest.cc to Mac, now can be compiled and run
on Mac but some tests fail.
5. Add two functions into ui_test_utils.h: HideNativeWindow() and
ShowAndFocusNativeWindow(). The latter one shows a window and grabs the input
focus, which is useful for tests depending on fake keyboard/mouse events.
Because browser_keyevents_browsertests.cc and browser_focus_uitest.cc
belong to interactive_ui_tests, which is not available on Mac (see
http://crbug.com/21276), in order to test them on Mac, you may want to
move them into browser_tests locally. But it won't work on build and try
bots, because these tests must be run with screen unlocked.
This CL depends on CL: http://codereview.chromium.org/2973004
and http://codereview.chromium.org/2805075
BUG=22515 Keyboard handling needs unit tests
BUG=48671 interactive_ui_test: BrowserKeyEventsTest.NormalKeyEvents is flaky
BUG=48936 Browser window is opened inactivated when running an InProcessBrowserTest.
TEST=none
Review URL: http://codereview.chromium.org/2986004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/keyboard_code_conversion_gtk.cc')
| -rw-r--r-- | base/keyboard_code_conversion_gtk.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/base/keyboard_code_conversion_gtk.cc b/base/keyboard_code_conversion_gtk.cc index 91de891..9e6bfd1 100644 --- a/base/keyboard_code_conversion_gtk.cc +++ b/base/keyboard_code_conversion_gtk.cc @@ -33,9 +33,6 @@ // WindowsKeyCodeForGdkKeyCode is copied from platform/gtk/KeyEventGtk.cpp -#ifndef BASE_KEYBOARD_CODE_CONVERSION_GTK_H_ -#define BASE_KEYBOARD_CODE_CONVERSION_GTK_H_ - #include "base/keyboard_code_conversion_gtk.h" #include <gdk/gdkkeysyms.h> @@ -615,6 +612,4 @@ int GdkKeyCodeForWindowsKeyCode(base::KeyboardCode keycode, bool shift) { } } -} // namespace - -#endif // BASE_KEYBOARD_CODE_CONVERSION_GTK_H_ +} // namespace base |