diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-10 20:30:41 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-10 20:30:41 +0000 |
commit | afdcf5c1551bf741662c60d42cae425b3c017ef7 (patch) | |
tree | f53b5ce5dba4765b4f11a921ee94122aab443d3a /chrome | |
parent | 743daf194f9bb1ebba83b16b13e1f16b3fce861e (diff) | |
download | chromium_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 'chrome')
34 files changed, 60 insertions, 60 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h index d9e9fe4..f92f097 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.h +++ b/chrome/browser/renderer_host/browser_render_process_host.h @@ -19,7 +19,7 @@ #include "chrome/browser/renderer_host/audio_renderer_host.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/notification_observer.h" -#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "webkit/api/public/WebCache.h" class CommandLine; class GURL; diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 395167c..265b8ea 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -38,7 +38,7 @@ #include "chrome/common/url_constants.h" #include "net/base/net_util.h" #include "skia/include/SkBitmap.h" -#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" +#include "webkit/api/public/WebFindOptions.h" #include "webkit/glue/autofill_form.h" using base::TimeDelta; diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 34fd03c..1e7bc4f 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -14,7 +14,7 @@ #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/common/modal_dialog_event.h" #include "chrome/common/page_zoom.h" -#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "webkit/api/public/WebConsoleMessage.h" #include "webkit/glue/autofill_form.h" #include "webkit/glue/password_form_dom_manager.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index e737606..c0e08e7 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -16,7 +16,7 @@ #include "chrome/common/x11_util.h" #include "chrome/browser/renderer_host/backing_store.h" #include "chrome/browser/renderer_host/render_widget_host.h" -#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" +#include "webkit/api/public/gtk/WebInputEventFactory.h" #include "webkit/glue/webcursor_gtk_data.h" using WebKit::WebInputEventFactory; diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 3312ade..b9290d4 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -28,8 +28,8 @@ #include "chrome/common/render_messages.h" #include "grit/webkit_resources.h" #include "skia/ext/skia_utils_win.h" -#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "webkit/api/public/WebInputEvent.h" +#include "webkit/api/public/win/WebInputEventFactory.h" #include "views/focus/focus_util_win.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! #include "views/widget/widget_win.h" diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 5f3051c..0b86265 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -43,9 +43,9 @@ #endif #if defined(OS_WIN) -#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h" +#include "webkit/api/public/win/WebScreenInfoFactory.h" #elif defined(OS_MACOSX) -#include "third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h" +#include "webkit/api/public/mac/WebScreenInfoFactory.h" #endif using WebKit::WebCache; diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index f394745..c28618b 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -23,7 +23,7 @@ #include "chrome/common/modal_dialog_event.h" #include "chrome/common/notification_observer.h" #include "chrome/common/transport_dib.h" -#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "webkit/api/public/WebCache.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc index 8328a90..052713c 100644 --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc @@ -10,8 +10,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/x11_util.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h" +#include "webkit/api/public/WebScreenInfo.h" +#include "webkit/api/public/x11/WebScreenInfoFactory.h" using WebKit::WebScreenInfo; using WebKit::WebScreenInfoFactory; diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h index 1e9b642..70f3560 100644 --- a/chrome/browser/renderer_host/web_cache_manager.h +++ b/chrome/browser/renderer_host/web_cache_manager.h @@ -17,7 +17,7 @@ #include "base/singleton.h" #include "base/task.h" #include "base/time.h" -#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "webkit/api/public/WebCache.h" class PrefService; diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h index 0c940a4..57a6d63 100644 --- a/chrome/browser/ssl/ssl_manager.h +++ b/chrome/browser/ssl/ssl_manager.h @@ -21,7 +21,7 @@ #include "net/base/net_errors.h" #include "net/base/ssl_info.h" #include "net/base/x509_certificate.h" -#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "webkit/api/public/WebConsoleMessage.h" #include "webkit/glue/resource_type.h" class AutomationProvider; diff --git a/chrome/common/native_web_keyboard_event.h b/chrome/common/native_web_keyboard_event.h index 0400b41..8dece32 100644 --- a/chrome/common/native_web_keyboard_event.h +++ b/chrome/common/native_web_keyboard_event.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_ #include "base/basictypes.h" -#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "webkit/api/public/WebInputEvent.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/common/native_web_keyboard_event_linux.cc b/chrome/common/native_web_keyboard_event_linux.cc index a2e606f..ae3b25a 100644 --- a/chrome/common/native_web_keyboard_event_linux.cc +++ b/chrome/common/native_web_keyboard_event_linux.cc @@ -4,7 +4,7 @@ #include "chrome/common/native_web_keyboard_event.h" -#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" +#include "webkit/api/public/gtk/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/chrome/common/native_web_keyboard_event_win.cc b/chrome/common/native_web_keyboard_event_win.cc index 184fc72..2fe23f1 100644 --- a/chrome/common/native_web_keyboard_event_win.cc +++ b/chrome/common/native_web_keyboard_event_win.cc @@ -4,7 +4,7 @@ #include "chrome/common/native_web_keyboard_event.h" -#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "webkit/api/public/win/WebInputEventFactory.h" using WebKit::WebInputEventFactory; using WebKit::WebKeyboardEvent; diff --git a/chrome/common/webkit_param_traits.h b/chrome/common/webkit_param_traits.h index 74f311a..b680782 100644 --- a/chrome/common/webkit_param_traits.h +++ b/chrome/common/webkit_param_traits.h @@ -24,11 +24,11 @@ #define CHROME_COMMON_WEBKIT_PARAM_TRAITS_H_ #include "chrome/common/ipc_message_utils.h" -#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" -#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" -#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "webkit/api/public/WebCache.h" +#include "webkit/api/public/WebConsoleMessage.h" +#include "webkit/api/public/WebFindOptions.h" +#include "webkit/api/public/WebInputEvent.h" +#include "webkit/api/public/WebScreenInfo.h" namespace IPC { diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index 597ac40..1a3614f 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -12,7 +12,7 @@ #include "chrome/renderer/js_only_v8_extensions.h" #include "chrome/renderer/render_view.h" #include "grit/renderer_resources.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "webkit/api/public/WebScriptSource.h" #include "webkit/glue/webframe.h" using WebKit::WebScriptSource; diff --git a/chrome/renderer/media/video_renderer_impl.h b/chrome/renderer/media/video_renderer_impl.h index 9a39933..0453fa0 100644 --- a/chrome/renderer/media/video_renderer_impl.h +++ b/chrome/renderer/media/video_renderer_impl.h @@ -22,7 +22,7 @@ #include "media/base/factory.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" -#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" +#include "webkit/api/public/WebMediaPlayer.h" class VideoRendererImpl : public media::VideoRendererBase { public: diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 11b3cb0..ffdc80a 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -38,9 +38,9 @@ #include "chrome/renderer/renderer_webkitclient_impl.h" #include "chrome/renderer/user_script_slave.h" #include "chrome/renderer/visitedlink_slave.h" -#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" -#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "webkit/api/public/WebCache.h" +#include "webkit/api/public/WebKit.h" +#include "webkit/api/public/WebString.h" #include "webkit/extensions/v8/gears_extension.h" #include "webkit/extensions/v8/interval_extension.h" #include "webkit/extensions/v8/playback_extension.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index d0f0c74..5e573fa 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -50,11 +50,11 @@ #include "printing/units.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/image_operations.h" -#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" -#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" -#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" -#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "webkit/api/public/WebDragData.h" +#include "webkit/api/public/WebPoint.h" +#include "webkit/api/public/WebRect.h" +#include "webkit/api/public/WebScriptSource.h" +#include "webkit/api/public/WebSize.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_serializer.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 17abcc2..dcd2de1 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -24,7 +24,7 @@ #include "chrome/renderer/render_widget.h" #include "skia/include/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "webkit/api/public/WebConsoleMessage.h" #include "webkit/glue/dom_serializer_delegate.h" #include "webkit/glue/form_data.h" #include "webkit/glue/password_form_dom_manager.h" diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 7387665..db181bd 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -15,9 +15,9 @@ #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" #include "skia/include/SkShader.h" -#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "webkit/api/public/WebRect.h" +#include "webkit/api/public/WebScreenInfo.h" +#include "webkit/api/public/WebSize.h" #if defined(OS_POSIX) #include "skia/include/SkPixelRef.h" diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 660ccbb..d2cdf96 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -18,7 +18,7 @@ #include "skia/ext/platform_canvas.h" #include "skia/include/SkBitmap.h" -#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "webkit/api/public/WebRect.h" #include "webkit/glue/webwidget_delegate.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 354e01f..7ccdec4 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -25,9 +25,9 @@ #include "chrome/renderer/render_process.h" #include "chrome/renderer/render_thread.h" #include "googleurl/src/url_util.h" -#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" -#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "webkit/api/public/WebKit.h" +#include "webkit/api/public/WebKitClient.h" +#include "webkit/api/public/WebString.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index 78f3c22..5e7d0bb 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -11,8 +11,8 @@ #include "chrome/renderer/net/render_dns_master.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/visitedlink_slave.h" -#include "third_party/WebKit/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "webkit/api/public/WebString.h" +#include "webkit/api/public/WebURL.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h index ef93dee..2e43515 100644 --- a/chrome/renderer/renderer_webkitclient_impl.h +++ b/chrome/renderer/renderer_webkitclient_impl.h @@ -10,7 +10,7 @@ #include "webkit/glue/webkitclient_impl.h" #if defined(OS_WIN) -#include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h" +#include "webkit/api/public/win/WebSandboxSupport.h" #endif class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl { diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 4f44ef9..fa4eb7d 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -12,7 +12,7 @@ #include "base/shared_memory.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "webkit/api/public/WebScriptSource.h" #include "webkit/glue/webframe.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/webmediaplayer_impl.cc b/chrome/renderer/webmediaplayer_impl.cc index a2d220d..9cff367 100644 --- a/chrome/renderer/webmediaplayer_impl.cc +++ b/chrome/renderer/webmediaplayer_impl.cc @@ -16,9 +16,9 @@ #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/null_audio_renderer.h" -#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" -#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "webkit/api/public/WebRect.h" +#include "webkit/api/public/WebSize.h" +#include "webkit/api/public/WebURL.h" using WebKit::WebRect; using WebKit::WebSize; diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h index e7ee2f2..bce6205 100644 --- a/chrome/renderer/webmediaplayer_impl.h +++ b/chrome/renderer/webmediaplayer_impl.h @@ -50,8 +50,8 @@ #include "base/message_loop.h" #include "media/base/filters.h" #include "media/base/pipeline_impl.h" -#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" -#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" +#include "webkit/api/public/WebMediaPlayer.h" +#include "webkit/api/public/WebMediaPlayerClient.h" class AudioRendererImpl; class DataSourceImpl; diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc index 60fcebb..d5c5ede 100644 --- a/chrome/renderer/webworker_proxy.cc +++ b/chrome/renderer/webworker_proxy.cc @@ -7,8 +7,8 @@ #include "chrome/common/child_thread.h" #include "chrome/common/render_messages.h" #include "chrome/common/worker_messages.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" -#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" +#include "webkit/api/public/WebURL.h" +#include "webkit/api/public/WebWorkerClient.h" using WebKit::WebString; using WebKit::WebURL; diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h index 7c44ba6..b2b361d 100644 --- a/chrome/renderer/webworker_proxy.h +++ b/chrome/renderer/webworker_proxy.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "chrome/common/ipc_channel.h" -#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" +#include "webkit/api/public/WebWorker.h" class ChildThread; class GURL; diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc index 583fff6..9885334 100644 --- a/chrome/test/render_view_test.cc +++ b/chrome/test/render_view_test.cc @@ -10,8 +10,8 @@ #include "chrome/renderer/extensions/extension_process_bindings.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/js_only_v8_extensions.h" -#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "webkit/api/public/WebKit.h" +#include "webkit/api/public/WebScriptSource.h" #include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview.h" diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc index 4e154e2..2c57dad 100644 --- a/chrome/worker/webworkerclient_proxy.cc +++ b/chrome/worker/webworkerclient_proxy.cc @@ -8,9 +8,9 @@ #include "chrome/common/ipc_logging.h" #include "chrome/common/worker_messages.h" #include "chrome/worker/worker_thread.h" -#include "third_party/WebKit/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" -#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" +#include "webkit/api/public/WebString.h" +#include "webkit/api/public/WebURL.h" +#include "webkit/api/public/WebWorker.h" using WebKit::WebString; using WebKit::WebWorker; diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h index ccf9557..9de4dd9 100644 --- a/chrome/worker/webworkerclient_proxy.h +++ b/chrome/worker/webworkerclient_proxy.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/common/ipc_channel.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" +#include "webkit/api/public/WebWorkerClient.h" namespace WebKit { class WebWorker; diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc index 8ae8fab..8f3aebf 100644 --- a/chrome/worker/worker_thread.cc +++ b/chrome/worker/worker_thread.cc @@ -7,7 +7,7 @@ #include "chrome/common/worker_messages.h" #include "chrome/worker/webworkerclient_proxy.h" #include "chrome/worker/worker_webkitclient_impl.h" -#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "webkit/api/public/WebKit.h" WorkerThread::WorkerThread() : ChildThread(base::Thread::Options(MessageLoop::TYPE_DEFAULT, diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index b896a8a..21d715ab 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/renderer/webworker_proxy.h" #include "chrome/worker/worker_thread.h" -#include "third_party/WebKit/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "webkit/api/public/WebString.h" +#include "webkit/api/public/WebURL.h" WebKit::WebClipboard* WorkerWebKitClientImpl::clipboard() { NOTREACHED(); |