diff options
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 2 | ||||
-rw-r--r-- | chrome/renderer/media/video_renderer_impl.h | 2 | ||||
-rw-r--r-- | chrome/renderer/render_thread.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/render_view.cc | 10 | ||||
-rw-r--r-- | chrome/renderer/render_view.h | 2 | ||||
-rw-r--r-- | chrome/renderer/render_widget.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/render_widget.h | 2 | ||||
-rw-r--r-- | chrome/renderer/renderer_glue.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.h | 2 | ||||
-rw-r--r-- | chrome/renderer/user_script_slave.cc | 2 | ||||
-rw-r--r-- | chrome/renderer/webmediaplayer_impl.cc | 6 | ||||
-rw-r--r-- | chrome/renderer/webmediaplayer_impl.h | 4 | ||||
-rw-r--r-- | chrome/renderer/webworker_proxy.cc | 4 | ||||
-rw-r--r-- | chrome/renderer/webworker_proxy.h | 2 |
15 files changed, 30 insertions, 30 deletions
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; |