summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-10 20:30:41 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-10 20:30:41 +0000
commitafdcf5c1551bf741662c60d42cae425b3c017ef7 (patch)
treef53b5ce5dba4765b4f11a921ee94122aab443d3a /webkit/tools/test_shell
parent743daf194f9bb1ebba83b16b13e1f16b3fce861e (diff)
downloadchromium_src-afdcf5c1551bf741662c60d42cae425b3c017ef7.zip
chromium_src-afdcf5c1551bf741662c60d42cae425b3c017ef7.tar.gz
chromium_src-afdcf5c1551bf741662c60d42cae425b3c017ef7.tar.bz2
Move WebKit API to src/webkit/api.
R=dglazkov Review URL: http://codereview.chromium.org/113186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/drag_delegate.cc2
-rw-r--r--webkit/tools/test_shell/drop_delegate.cc4
-rw-r--r--webkit/tools/test_shell/event_sending_controller.cc6
-rw-r--r--webkit/tools/test_shell/event_sending_controller.h2
-rw-r--r--webkit/tools/test_shell/keyboard_unittest.cc2
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc2
-rw-r--r--webkit/tools/test_shell/mock_webclipboard_impl.cc6
-rw-r--r--webkit/tools/test_shell/mock_webclipboard_impl.h4
-rw-r--r--webkit/tools/test_shell/plugin_tests.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_webkit_init.h8
-rwxr-xr-xwebkit/tools/test_shell/test_webview_delegate.cc8
-rwxr-xr-xwebkit/tools/test_shell/test_webview_delegate_gtk.cc2
-rwxr-xr-xwebkit/tools/test_shell/test_webview_delegate_win.cc2
-rw-r--r--webkit/tools/test_shell/test_webworker_helper.cc4
-rw-r--r--webkit/tools/test_shell/test_webworker_helper.h2
-rw-r--r--webkit/tools/test_shell/test_worker/test_webworker.h6
-rw-r--r--webkit/tools/test_shell/test_worker/test_worker_main.cc4
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc10
-rw-r--r--webkit/tools/test_shell/webwidget_host_win.cc10
20 files changed, 45 insertions, 45 deletions
diff --git a/webkit/tools/test_shell/drag_delegate.cc b/webkit/tools/test_shell/drag_delegate.cc
index 1759a68..f3532ad 100644
--- a/webkit/tools/test_shell/drag_delegate.cc
+++ b/webkit/tools/test_shell/drag_delegate.cc
@@ -6,7 +6,7 @@
#include <atltypes.h>
-#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
+#include "webkit/api/public/WebPoint.h"
#include "webkit/glue/webview.h"
using WebKit::WebPoint;
diff --git a/webkit/tools/test_shell/drop_delegate.cc b/webkit/tools/test_shell/drop_delegate.cc
index fed2514..41b4767 100644
--- a/webkit/tools/test_shell/drop_delegate.cc
+++ b/webkit/tools/test_shell/drop_delegate.cc
@@ -4,8 +4,8 @@
#include "webkit/tools/test_shell/drop_delegate.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
+#include "webkit/api/public/WebDragData.h"
+#include "webkit/api/public/WebPoint.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/webview.h"
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 0fce5e1..9e88f88 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -28,13 +28,13 @@
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
+#include "webkit/api/public/WebDragData.h"
+#include "webkit/api/public/WebPoint.h"
#include "webkit/glue/webview.h"
#include "webkit/tools/test_shell/test_shell.h"
#if defined(OS_WIN)
-#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
+#include "webkit/api/public/win/WebInputEventFactory.h"
using WebKit::WebInputEventFactory;
#endif
diff --git a/webkit/tools/test_shell/event_sending_controller.h b/webkit/tools/test_shell/event_sending_controller.h
index 1571c68..353c411 100644
--- a/webkit/tools/test_shell/event_sending_controller.h
+++ b/webkit/tools/test_shell/event_sending_controller.h
@@ -19,7 +19,7 @@
#include "build/build_config.h"
#include "base/gfx/point.h"
#include "base/task.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/api/public/WebInputEvent.h"
#include "webkit/glue/cpp_bound_class.h"
class TestShell;
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc
index 713739b..10f9e741 100644
--- a/webkit/tools/test_shell/keyboard_unittest.cc
+++ b/webkit/tools/test_shell/keyboard_unittest.cc
@@ -18,7 +18,7 @@ MSVC_POP_WARNING();
#include "webkit/glue/editor_client_impl.h"
#include "webkit/glue/event_conversion.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/api/public/WebInputEvent.h"
using WebCore::PlatformKeyboardEvent;
using WebCore::KeyboardEvent;
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index 77192d5..f82f187 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -14,7 +14,7 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/string_util.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
+#include "webkit/api/public/WebScriptSource.h"
#include "webkit/glue/dom_operations.h"
#include "webkit/glue/webframe.h"
#include "webkit/glue/webpreferences.h"
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc
index 305eabf..5f372f9 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.cc
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc
@@ -8,15 +8,15 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "net/base/escape.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebImage.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "webkit/api/public/WebImage.h"
+#include "webkit/api/public/WebURL.h"
#include "webkit/glue/webclipboard_impl.h"
#include "webkit/glue/webkit_glue.h"
using WebKit::WebString;
using WebKit::WebURL;
-bool MockWebClipboardImpl::isFormatAvailable(Format format) {
+bool MockWebClipboardImpl::isFormatAvailable(Format format) {
switch (format) {
case FormatHTML:
return !m_htmlText.isEmpty();
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.h b/webkit/tools/test_shell/mock_webclipboard_impl.h
index 6420244..dd47835 100644
--- a/webkit/tools/test_shell/mock_webclipboard_impl.h
+++ b/webkit/tools/test_shell/mock_webclipboard_impl.h
@@ -10,8 +10,8 @@
#ifndef WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
#define WEBKIT_TOOLS_TEST_SHELL_MOCK_WEBCLIPBOARD_IMPL_H_
-#include "third_party/WebKit/WebKit/chromium/public/WebClipboard.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "webkit/api/public/WebClipboard.h"
+#include "webkit/api/public/WebString.h"
class MockWebClipboardImpl : public WebKit::WebClipboard {
public:
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index 1fa32d4..3b12df6 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -10,8 +10,8 @@
#include "base/string_util.h"
#include "net/base/escape.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/api/public/WebScriptSource.h"
+#include "webkit/api/public/WebInputEvent.h"
#include "webkit/glue/webframe.h"
#include "webkit/glue/webview.h"
#include "webkit/tools/test_shell/test_shell.h"
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 6e8a385..6dc5c2b 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -25,7 +25,7 @@
#include "net/http/http_cache.h"
#include "net/base/ssl_test_util.h"
#include "net/url_request/url_request_context.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
+#include "webkit/api/public/WebKit.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/window_open_disposition.h"
#include "webkit/extensions/v8/gc_extension.h"
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 40ffdca..fe00c3d 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -7,10 +7,10 @@
#include "base/stats_counters.h"
#include "base/string_util.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebData.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "webkit/api/public/WebData.h"
+#include "webkit/api/public/WebKit.h"
+#include "webkit/api/public/WebString.h"
+#include "webkit/api/public/WebURL.h"
#include "webkit/glue/simple_webmimeregistry_impl.h"
#include "webkit/glue/webclipboard_impl.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 93d498c..092b2a56 100755
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -17,10 +17,10 @@
#include "base/string_util.h"
#include "base/trace_event.h"
#include "net/base/net_errors.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "webkit/api/public/WebDragData.h"
+#include "webkit/api/public/WebKit.h"
+#include "webkit/api/public/WebScreenInfo.h"
+#include "webkit/api/public/WebString.h"
#include "webkit/glue/webdatasource.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/weberror.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 5062c7c..f8822bd 100755
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -14,7 +14,7 @@
#include "base/string_util.h"
#include "net/base/net_errors.h"
#include "chrome/common/page_transition_types.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
+#include "webkit/api/public/WebRect.h"
#include "webkit/glue/webcursor.h"
#include "webkit/glue/webdatasource.h"
#include "webkit/glue/webdropdata.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index f16c766..cb98dbf 100755
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -19,7 +19,7 @@
#include "base/string_util.h"
#include "base/trace_event.h"
#include "net/base/net_errors.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
+#include "webkit/api/public/WebRect.h"
#include "webkit/glue/webdatasource.h"
#include "webkit/glue/webdropdata.h"
#include "webkit/glue/weberror.h"
diff --git a/webkit/tools/test_shell/test_webworker_helper.cc b/webkit/tools/test_shell/test_webworker_helper.cc
index 20a8d4e..9620c1e 100644
--- a/webkit/tools/test_shell/test_webworker_helper.cc
+++ b/webkit/tools/test_shell/test_webworker_helper.cc
@@ -18,8 +18,8 @@
#include "base/logging.h"
#include "base/file_util.h"
#include "base/path_service.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
+#include "webkit/api/public/WebKit.h"
+#include "webkit/api/public/WebKitClient.h"
using WebKit::WebWorker;
using WebKit::WebWorkerClient;
diff --git a/webkit/tools/test_shell/test_webworker_helper.h b/webkit/tools/test_shell/test_webworker_helper.h
index 951950b..62a9efa 100644
--- a/webkit/tools/test_shell/test_webworker_helper.h
+++ b/webkit/tools/test_shell/test_webworker_helper.h
@@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/port.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "webkit/api/public/WebString.h"
#include <wtf/MainThread.h>
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.h b/webkit/tools/test_shell/test_worker/test_webworker.h
index a7e8030..1071775 100644
--- a/webkit/tools/test_shell/test_worker/test_webworker.h
+++ b/webkit/tools/test_shell/test_worker/test_webworker.h
@@ -11,9 +11,9 @@
#include "base/basictypes.h"
#include "base/ref_counted.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h"
+#include "webkit/api/public/WebString.h"
+#include "webkit/api/public/WebWorker.h"
+#include "webkit/api/public/WebWorkerClient.h"
class GURL;
class TestWebWorkerHelper;
diff --git a/webkit/tools/test_shell/test_worker/test_worker_main.cc b/webkit/tools/test_shell/test_worker/test_worker_main.cc
index 9273d35..50185b9 100644
--- a/webkit/tools/test_shell/test_worker/test_worker_main.cc
+++ b/webkit/tools/test_shell/test_worker/test_worker_main.cc
@@ -11,8 +11,8 @@
#include "base/scoped_ptr.h"
#include "base/string_util.h"
#include "googleurl/src/gurl.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "webkit/api/public/WebKit.h"
+#include "webkit/api/public/WebString.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webkitclient_impl.h"
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 3bba172..4b66004 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -12,11 +12,11 @@
#include "skia/ext/bitmap_platform_device_linux.h"
#include "skia/ext/platform_canvas_linux.h"
#include "skia/ext/platform_device_linux.h"
-#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h"
-#include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
+#include "webkit/api/public/gtk/WebInputEventFactory.h"
+#include "webkit/api/public/x11/WebScreenInfoFactory.h"
+#include "webkit/api/public/WebInputEvent.h"
+#include "webkit/api/public/WebScreenInfo.h"
+#include "webkit/api/public/WebSize.h"
#include "webkit/glue/webwidget.h"
#include "webkit/tools/test_shell/test_shell.h"
#include "webkit/tools/test_shell/test_shell_x11.h"
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index c5464ef..9deca4c 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -9,11 +9,11 @@
#include "base/win_util.h"
#include "skia/ext/platform_canvas.h"
#include "skia/ext/platform_canvas_win.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
-#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
-#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h"
+#include "webkit/api/public/WebInputEvent.h"
+#include "webkit/api/public/WebScreenInfo.h"
+#include "webkit/api/public/WebSize.h"
+#include "webkit/api/public/win/WebInputEventFactory.h"
+#include "webkit/api/public/win/WebScreenInfoFactory.h"
#include "webkit/glue/webwidget.h"
#include "webkit/tools/test_shell/test_shell.h"