summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 00:04:34 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-10 00:04:34 +0000
commit8d1b864d1d90a055a6280b62541624793842ce9c (patch)
tree85932f19dc4ad3771fed903cd3ed7cfaf9857e1b /webkit/support
parentaf1f9f3ab83cd5184d2b0f71492358aabc3129fc (diff)
downloadchromium_src-8d1b864d1d90a055a6280b62541624793842ce9c.zip
chromium_src-8d1b864d1d90a055a6280b62541624793842ce9c.tar.gz
chromium_src-8d1b864d1d90a055a6280b62541624793842ce9c.tar.bz2
Fixed include in test_webkit_client
retrying "Revert 62068 - Move implementation of linux scrollbars from webkit using new" See: http://codereview.chromium.org/3618014 TBR:jam@chromium.org BUG=chromium-os:6857 TEST=Verify that both linux and chromeos scrollbars look right. Review URL: http://codereview.chromium.org/3697001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/test_webkit_client.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 8382fd0..2bc1494 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -28,7 +28,6 @@
#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebThemeEngine.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
#include "webkit/appcache/web_application_cache_host_impl.h"
#include "webkit/database/vfs_backend.h"
@@ -51,9 +50,11 @@
#include "v8/include/v8.h"
#if defined(OS_WIN)
+#include "third_party/WebKit/WebKit/chromium/public/win/WebThemeEngine.h"
#include "webkit/tools/test_shell/test_shell_webthemeengine.h"
-#endif
-#if defined(OS_MACOSX)
+#elif defined(OS_LINUX)
+#include "third_party/WebKit/WebKit/chromium/public/linux/WebThemeEngine.h"
+#elif defined(OS_MACOSX)
#include "base/mac_util.h"
#endif