diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 23:06:57 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 23:06:57 +0000 |
| commit | dcda464d91fb97423f5b551babffe786b24ee251 (patch) | |
| tree | 39c48d6ae9e45dd74a48e22395af68c1128f43e0 /webkit/tools | |
| parent | b93568f763472809870ff37735eab7e9cfcdb3c8 (diff) | |
| download | chromium_src-dcda464d91fb97423f5b551babffe786b24ee251.zip chromium_src-dcda464d91fb97423f5b551babffe786b24ee251.tar.gz chromium_src-dcda464d91fb97423f5b551babffe786b24ee251.tar.bz2 | |
Relanding the new autofill.
I rolled it back yesterday, it broke the Linux and Mac builds.
TBR=tim
Review URL: http://codereview.chromium.org/11543
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/keyboard_unittest.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_tests.vcproj | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc index de98b32..4389ab8 100644 --- a/webkit/tools/test_shell/keyboard_unittest.cc +++ b/webkit/tools/test_shell/keyboard_unittest.cc @@ -13,6 +13,8 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "KeyboardEvent.h" MSVC_POP_WARNING(); +#undef LOG + #include "webkit/glue/editor_client_impl.h" #include "webkit/glue/event_conversion.h" #include "webkit/glue/webinputevent.h" diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj index 38df275..26bd25d 100644 --- a/webkit/tools/test_shell/test_shell_tests.vcproj +++ b/webkit/tools/test_shell/test_shell_tests.vcproj @@ -295,10 +295,6 @@ Name="tests" > <File - RelativePath="..\..\glue\autocomplete_input_listener_unittest.cc" - > - </File> - <File RelativePath="..\..\port\platform\image-decoders\bmp\BMPImageDecoder_unittest.cpp" > </File> |