diff options
Diffstat (limited to 'chrome/renderer')
47 files changed, 132 insertions, 132 deletions
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 87dc832..aad6ceb 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -7,9 +7,9 @@ #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/glue_util.h" using WebKit::WebDevToolsAgent; diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h index 9f52e9e..26a6297 100644 --- a/chrome/renderer/devtools_agent.h +++ b/chrome/renderer/devtools_agent.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "webkit/api/public/WebDevToolsAgentClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" namespace IPC { class Message; diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 8049868..f67f183 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -9,8 +9,8 @@ #include "chrome/renderer/devtools_agent.h" #include "chrome/renderer/plugin_channel_host.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebDevToolsAgent; using WebKit::WebString; diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc index c950fb5..9b17c8b 100644 --- a/chrome/renderer/devtools_client.cc +++ b/chrome/renderer/devtools_client.cc @@ -10,8 +10,8 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsFrontend.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontend.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebDevToolsFrontend; using WebKit::WebString; diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h index a380255..e83ec12 100644 --- a/chrome/renderer/devtools_client.h +++ b/chrome/renderer/devtools_client.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "webkit/api/public/WebDevToolsFrontendClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontendClient.h" namespace IPC { class Message; diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 6c35b25..988068e 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index e23c060..ba7e898 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,9 +14,9 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "grit/renderer_resources.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" using bindings_utils::CallFunctionInContext; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index fee736a..ce5295a 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -25,10 +25,10 @@ #include "grit/renderer_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" using bindings_utils::GetStringResource; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index c647de4..f0e0bd5 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -4,7 +4,7 @@ #include "chrome/renderer/external_extension.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/external_host_bindings.cc b/chrome/renderer/external_host_bindings.cc index 1ab3cc0..51a71bc 100644 --- a/chrome/renderer/external_host_bindings.cc +++ b/chrome/renderer/external_host_bindings.cc @@ -6,8 +6,8 @@ #include "base/values.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebBindings; diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index e68c8e4..8688a56 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -8,7 +8,7 @@ #include "base/time.h" #include "chrome/renderer/navigation_state.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" using WebKit::WebDataSource; diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index e95e937..2b49390 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -12,7 +12,7 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebURLError; diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h index 5f3191d..90c1270 100644 --- a/chrome/renderer/navigation_state.h +++ b/chrome/renderer/navigation_state.h @@ -9,8 +9,8 @@ #include "base/time.h" #include "chrome/common/page_transition_types.h" #include "chrome/renderer/user_script_idle_scheduler.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/password_form.h" diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc index 2862e4a..9510cab 100644 --- a/chrome/renderer/notification_provider.cc +++ b/chrome/renderer/notification_provider.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h" using WebKit::WebNotification; using WebKit::WebNotificationPresenter; diff --git a/chrome/renderer/notification_provider.h b/chrome/renderer/notification_provider.h index f08d031..d02ee15 100644 --- a/chrome/renderer/notification_provider.h +++ b/chrome/renderer/notification_provider.h @@ -9,8 +9,8 @@ #include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebNotification.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" class RenderView; namespace WebKit { diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index fe49462..32e4064 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -11,11 +11,11 @@ #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/units.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.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 "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFrame; diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index eb3ffaf..44ae591 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -10,7 +10,7 @@ #include "base/gfx/size.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "webkit/api/public/WebViewClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" namespace gfx { class Size; diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc index dd1c986..4b2f92f 100644 --- a/chrome/renderer/print_web_view_helper_linux.cc +++ b/chrome/renderer/print_web_view_helper_linux.cc @@ -9,7 +9,7 @@ #include "chrome/common/render_messages.h" #include "printing/native_metafile.h" #include "skia/ext/vector_canvas.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index 98b26e5..ae579bb 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -14,9 +14,9 @@ #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/native_metafile.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebCanvas.h" -#include "webkit/api/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" using WebKit::WebFrame; using WebKit::WebCanvas; diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc index c5bf711..b3b64ea 100644 --- a/chrome/renderer/print_web_view_helper_win.cc +++ b/chrome/renderer/print_web_view_helper_win.cc @@ -12,8 +12,8 @@ #include "grit/generated_resources.h" #include "printing/native_metafile.h" #include "skia/ext/vector_canvas.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebConsoleMessage; using WebKit::WebFrame; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index a388929..a165b09 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -59,17 +59,17 @@ #include "chrome/renderer/user_script_slave.h" #include "ipc/ipc_message.h" #include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" -#include "webkit/api/public/WebCache.h" -#include "webkit/api/public/WebColor.h" -#include "webkit/api/public/WebCrossOriginPreflightResultCache.h" -#include "webkit/api/public/WebDatabase.h" -#include "webkit/api/public/WebFontCache.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebRuntimeFeatures.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebSecurityPolicy.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColor.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFontCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/extensions/v8/benchmarking_extension.h" #include "webkit/extensions/v8/gears_extension.h" #include "webkit/extensions/v8/interval_extension.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 245b6f5..006ae43 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -68,28 +68,28 @@ #include "net/base/net_errors.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/image_operations.h" -#include "webkit/api/public/WebAccessibilityCache.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFormElement.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebSearchableFormData.h" -#include "webkit/api/public/WebSecurityOrigin.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLError.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRange.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/WebSearchableFormData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.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/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/glue_serialize.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 53d7e95..e15438f 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -35,14 +35,14 @@ #include "chrome/renderer/render_view_visitor.h" #include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebFrameClient.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebTextDirection.h" -#include "webkit/api/public/WebView.h" -#include "webkit/api/public/WebViewClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" #include "webkit/glue/dom_serializer_delegate.h" #include "webkit/glue/form_data.h" #include "webkit/glue/image_resource_fetcher.h" diff --git a/chrome/renderer/render_view_linux.cc b/chrome/renderer/render_view_linux.cc index 9cc8a64..40f5fe1 100644 --- a/chrome/renderer/render_view_linux.cc +++ b/chrome/renderer/render_view_linux.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/render_view.h" #include "chrome/common/renderer_preferences.h" -#include "webkit/api/public/linux/WebFontRendering.h" +#include "third_party/WebKit/WebKit/chromium/public/linux/WebFontRendering.h" using WebKit::WebFontRendering; diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index 7a8172d..8afdbf6 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -13,8 +13,8 @@ #include "printing/image.h" #include "printing/native_metafile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" using WebKit::WebCompositionCommand; using WebKit::WebFrame; diff --git a/chrome/renderer/render_view_unittest_mac.mm b/chrome/renderer/render_view_unittest_mac.mm index a83af57..f8880c7 100644 --- a/chrome/renderer/render_view_unittest_mac.mm +++ b/chrome/renderer/render_view_unittest_mac.mm @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include <Cocoa/Cocoa.h> #include <Carbon/Carbon.h> // for the kVK_* constants. diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 0c5e970..85ecf77 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -15,12 +15,12 @@ #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkShader.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebPopupMenuInfo.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenuInfo.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/glue/webkit_glue.h" #if defined(OS_POSIX) @@ -28,7 +28,7 @@ #include "third_party/skia/include/core/SkMallocPixelRef.h" #endif // defined(OS_POSIX) -#include "webkit/api/public/WebWidget.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWidget.h" using WebKit::WebCompositionCommand; using WebKit::WebCursorInfo; diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 7428ec3..df17bd1 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -18,10 +18,10 @@ #include "ipc/ipc_channel.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebCompositionCommand.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebTextDirection.h" -#include "webkit/api/public/WebWidgetClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWidgetClient.h" #include "webkit/glue/webcursor.h" class RenderThreadBase; diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index c22820a..558589c 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -27,9 +27,9 @@ #include "chrome/renderer/socket_stream_dispatcher.h" #include "googleurl/src/url_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebString.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/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_bridge.h" diff --git a/chrome/renderer/renderer_web_database_observer.cc b/chrome/renderer/renderer_web_database_observer.cc index d99dfb4..15a5d17 100644 --- a/chrome/renderer/renderer_web_database_observer.cc +++ b/chrome/renderer/renderer_web_database_observer.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/renderer_web_database_observer.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" RendererWebDatabaseObserver::RendererWebDatabaseObserver( IPC::Message::Sender* sender) diff --git a/chrome/renderer/renderer_web_database_observer.h b/chrome/renderer/renderer_web_database_observer.h index 4e09b53..4c06853 100644 --- a/chrome/renderer/renderer_web_database_observer.h +++ b/chrome/renderer/renderer_web_database_observer.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_RENDERER_WEB_DATABASE_OBSERVER_H_ #include "ipc/ipc_message.h" -#include "webkit/api/public/WebDatabaseObserver.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabaseObserver.h" class RendererWebDatabaseObserver : public WebKit::WebDatabaseObserver { public: diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index d671a3f..cec8119 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -24,11 +24,11 @@ #include "chrome/renderer/renderer_webstoragenamespace_impl.h" #include "chrome/renderer/visitedlink_slave.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebCookie.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCookie.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.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/WebVector.h" #include "webkit/appcache/web_application_cache_host_impl.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 326d3a6..19e88a8 100644 --- a/chrome/renderer/renderer_webkitclient_impl.h +++ b/chrome/renderer/renderer_webkitclient_impl.h @@ -12,12 +12,12 @@ #include "webkit/glue/webkitclient_impl.h" #if defined(OS_WIN) -#include "webkit/api/public/win/WebSandboxSupport.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h" #elif defined(OS_LINUX) #include <string> #include <map> #include "base/lock.h" -#include "webkit/api/public/linux/WebSandboxSupport.h" +#include "third_party/WebKit/WebKit/chromium/public/linux/WebSandboxSupport.h" #endif class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl { diff --git a/chrome/renderer/renderer_webstoragearea_impl.cc b/chrome/renderer/renderer_webstoragearea_impl.cc index 3ddc29c..95e688e 100644 --- a/chrome/renderer/renderer_webstoragearea_impl.cc +++ b/chrome/renderer/renderer_webstoragearea_impl.cc @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebString; using WebKit::WebURL; diff --git a/chrome/renderer/renderer_webstoragearea_impl.h b/chrome/renderer/renderer_webstoragearea_impl.h index c61a0f1..2a13bf8 100644 --- a/chrome/renderer/renderer_webstoragearea_impl.h +++ b/chrome/renderer/renderer_webstoragearea_impl.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" class RendererWebStorageAreaImpl : public WebKit::WebStorageArea { public: diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h index c5a6dfb7..fd01435 100644 --- a/chrome/renderer/renderer_webstoragenamespace_impl.h +++ b/chrome/renderer/renderer_webstoragenamespace_impl.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/common/dom_storage_type.h" -#include "webkit/api/public/WebStorageNamespace.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace { public: diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 9fff626..6aafd4a 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "chrome/renderer/extension_groups.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h index 3d7c49d..5d3ae6b 100644 --- a/chrome/renderer/user_script_slave.h +++ b/chrome/renderer/user_script_slave.h @@ -14,7 +14,7 @@ #include "base/stl_util-inl.h" #include "base/string_piece.h" #include "chrome/common/extensions/user_script.h" -#include "webkit/api/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" namespace WebKit { class WebFrame; diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h index 740c7db..4adbc40 100644 --- a/chrome/renderer/webmediaplayer_impl.h +++ b/chrome/renderer/webmediaplayer_impl.h @@ -50,8 +50,8 @@ #include "media/base/filters.h" #include "media/base/pipeline_impl.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebMediaPlayer.h" -#include "webkit/api/public/WebMediaPlayerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" class AudioRendererImpl; class DataSourceImpl; diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc index b7ab0f5..ecb4984 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -18,7 +18,7 @@ #include "base/string_util.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/pepper/pepper.h" #include "webkit/glue/plugins/plugin_constants_win.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index db7a42a..3853115 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -29,13 +29,13 @@ #include "grit/renderer_resources.h" #include "net/base/mime_util.h" #include "printing/native_metafile.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/renderer/websharedworker_proxy.cc b/chrome/renderer/websharedworker_proxy.cc index 5bcde88..7ad1f61 100644 --- a/chrome/renderer/websharedworker_proxy.cc +++ b/chrome/renderer/websharedworker_proxy.cc @@ -7,7 +7,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread, int route_id, diff --git a/chrome/renderer/websharedworker_proxy.h b/chrome/renderer/websharedworker_proxy.h index 6adcf08..68dab47 100644 --- a/chrome/renderer/websharedworker_proxy.h +++ b/chrome/renderer/websharedworker_proxy.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/renderer/webworker_base.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebSharedWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorker.h" class ChildThread; diff --git a/chrome/renderer/websharedworkerrepository_impl.h b/chrome/renderer/websharedworkerrepository_impl.h index 4083202..d8cec99 100644 --- a/chrome/renderer/websharedworkerrepository_impl.h +++ b/chrome/renderer/websharedworkerrepository_impl.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_ #define CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_ -#include "webkit/api/public/WebSharedWorkerRepository.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorkerRepository.h" namespace WebKit { class WebSharedWorker; diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc index 1364e7a..e32026c 100644 --- a/chrome/renderer/webworker_base.cc +++ b/chrome/renderer/webworker_base.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc index e8a5b9d..a263565 100644 --- a/chrome/renderer/webworker_proxy.cc +++ b/chrome/renderer/webworker_proxy.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" using WebKit::WebCommonWorkerClient; using WebKit::WebMessagePortChannel; diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h index 48487c0..fb2db3ed 100644 --- a/chrome/renderer/webworker_proxy.h +++ b/chrome/renderer/webworker_proxy.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "chrome/renderer/webworker_base.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" class ChildThread; class GURL; |