diff options
79 files changed, 147 insertions, 147 deletions
diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/debugger/worker_devtools_manager.cc index 6709d75..2029648 100644 --- a/content/browser/debugger/worker_devtools_manager.cc +++ b/content/browser/debugger/worker_devtools_manager.cc @@ -21,9 +21,9 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/process_type.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using content::BrowserThread; diff --git a/content/browser/geolocation/win7_location_provider_unittest_win.cc b/content/browser/geolocation/win7_location_provider_unittest_win.cc index c76881a..d4b09b0 100644 --- a/content/browser/geolocation/win7_location_provider_unittest_win.cc +++ b/content/browser/geolocation/win7_location_provider_unittest_win.cc @@ -138,4 +138,4 @@ TEST_F(GeolocationProviderWin7Tests, GetInvalidPosition) { EXPECT_FALSE(position.IsValidFix()); } -} // namespace
\ No newline at end of file +} // namespace diff --git a/content/browser/idbbindingutilities_browsertest.cc b/content/browser/idbbindingutilities_browsertest.cc index 6c1f562..447fb37 100644 --- a/content/browser/idbbindingutilities_browsertest.cc +++ b/content/browser/idbbindingutilities_browsertest.cc @@ -15,7 +15,7 @@ #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" #include "webkit/glue/idb_bindings.h" #include "webkit/glue/web_io_operators.h" diff --git a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc index ff2d2111..a1e94a1 100644 --- a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc +++ b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc @@ -10,10 +10,10 @@ #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h" #include "content/common/indexed_db_key.h" #include "content/public/common/serialized_script_value.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "webkit/glue/webkit_glue.h" BrowserWebKitPlatformSupportImpl::BrowserWebKitPlatformSupportImpl() { diff --git a/content/browser/in_process_webkit/dom_storage_area.cc b/content/browser/in_process_webkit/dom_storage_area.cc index ea0b3d9..3079e43 100644 --- a/content/browser/in_process_webkit/dom_storage_area.cc +++ b/content/browser/in_process_webkit/dom_storage_area.cc @@ -9,8 +9,8 @@ #include "content/browser/in_process_webkit/dom_storage_namespace.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebSecurityOrigin; diff --git a/content/browser/in_process_webkit/dom_storage_context.cc b/content/browser/in_process_webkit/dom_storage_context.cc index 1926baf..cbae12e 100644 --- a/content/browser/in_process_webkit/dom_storage_context.cc +++ b/content/browser/in_process_webkit/dom_storage_context.cc @@ -16,7 +16,7 @@ #include "content/common/dom_storage_common.h" #include "content/public/browser/browser_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "webkit/glue/webkit_glue.h" #include "webkit/quota/special_storage_policy.h" diff --git a/content/browser/in_process_webkit/dom_storage_namespace.h b/content/browser/in_process_webkit/dom_storage_namespace.h index 1a6f124..343d737 100644 --- a/content/browser/in_process_webkit/dom_storage_namespace.h +++ b/content/browser/in_process_webkit/dom_storage_namespace.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "content/common/dom_storage_common.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" class DOMStorageArea; class DOMStorageContext; diff --git a/content/browser/in_process_webkit/indexed_db_callbacks.h b/content/browser/in_process_webkit/indexed_db_callbacks.h index de9edaf..f980060 100644 --- a/content/browser/in_process_webkit/indexed_db_callbacks.h +++ b/content/browser/in_process_webkit/indexed_db_callbacks.h @@ -14,7 +14,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" class IndexedDBMsg_CallbacksSuccessIDBDatabase; class IndexedDBMsg_CallbacksSuccessIDBTransaction; diff --git a/content/browser/in_process_webkit/indexed_db_context.cc b/content/browser/in_process_webkit/indexed_db_context.cc index b54c83f..7aeb684e 100644 --- a/content/browser/in_process_webkit/indexed_db_context.cc +++ b/content/browser/in_process_webkit/indexed_db_context.cc @@ -16,11 +16,11 @@ #include "content/browser/in_process_webkit/webkit_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "webkit/database/database_util.h" #include "webkit/glue/webkit_glue.h" #include "webkit/quota/quota_manager.h" diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc index d03b1d6..e55e122 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -27,7 +27,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "webkit/glue/webkit_glue.h" using content::BrowserThread; diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc index a19258ab..4e7b1f0 100644 --- a/content/common/child_process_sandbox_support_impl_linux.cc +++ b/content/common/child_process_sandbox_support_impl_linux.cc @@ -13,7 +13,7 @@ #include "content/common/chrome_descriptors.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/unix_domain_socket_posix.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontFamily.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h" static int GetSandboxFD() { diff --git a/content/common/css_colors.h b/content/common/css_colors.h index 2b79e5a..a2dbf1f 100644 --- a/content/common/css_colors.h +++ b/content/common/css_colors.h @@ -9,8 +9,8 @@ #include <utility> #include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColor.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebColor.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebColorName.h" // Functionality related to sending the values of CSS colors to the renderer. class CSSColors { diff --git a/content/common/database_util.cc b/content/common/database_util.cc index c58cca9..d305df9 100644 --- a/content/common/database_util.cc +++ b/content/common/database_util.cc @@ -8,7 +8,7 @@ #include "content/common/database_messages.h" #include "ipc/ipc_sync_message_filter.h" #include "third_party/sqlite/sqlite3.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebKitPlatformSupport; using WebKit::WebString; diff --git a/content/common/db_message_filter.cc b/content/common/db_message_filter.cc index 132346e..766adbb 100644 --- a/content/common/db_message_filter.cc +++ b/content/common/db_message_filter.cc @@ -6,7 +6,7 @@ #include "content/common/database_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" DBMessageFilter::DBMessageFilter() { } diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/file_system/webfilesystem_callback_dispatcher.cc index 39feaf3..4ca24eb 100644 --- a/content/common/file_system/webfilesystem_callback_dispatcher.cc +++ b/content/common/file_system/webfilesystem_callback_dispatcher.cc @@ -12,9 +12,9 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFileInfo; diff --git a/content/common/file_system/webfilesystem_impl.cc b/content/common/file_system/webfilesystem_impl.cc index 7f7099b..2d176cf3 100644 --- a/content/common/file_system/webfilesystem_impl.cc +++ b/content/common/file_system/webfilesystem_impl.cc @@ -10,8 +10,8 @@ #include "content/common/file_system/webfilewriter_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFileInfo; diff --git a/content/common/file_system/webfilesystem_impl.h b/content/common/file_system/webfilesystem_impl.h index c364a6c..13ef424 100644 --- a/content/common/file_system/webfilesystem_impl.h +++ b/content/common/file_system/webfilesystem_impl.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" namespace WebKit { class WebURL; diff --git a/content/common/gamepad_hardware_buffer.h b/content/common/gamepad_hardware_buffer.h index c673d06a..077c782 100644 --- a/content/common/gamepad_hardware_buffer.h +++ b/content/common/gamepad_hardware_buffer.h @@ -6,7 +6,7 @@ #define CONTENT_COMMON_GAMEPAD_HARDWARE_BUFFER_H_ #include "content/common/gamepad_seqlock.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGamepads.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h" namespace content { diff --git a/content/common/indexed_db_key.cc b/content/common/indexed_db_key.cc index 44cb81a..4f76873 100644 --- a/content/common/indexed_db_key.cc +++ b/content/common/indexed_db_key.cc @@ -5,8 +5,8 @@ #include "content/common/indexed_db_key.h" #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" using WebKit::WebIDBKey; diff --git a/content/common/web_database_observer_impl.cc b/content/common/web_database_observer_impl.cc index be3c8ca..088701d 100644 --- a/content/common/web_database_observer_impl.cc +++ b/content/common/web_database_observer_impl.cc @@ -7,7 +7,7 @@ #include "base/string16.h" #include "content/common/database_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" WebDatabaseObserverImpl::WebDatabaseObserverImpl( IPC::Message::Sender* sender) diff --git a/content/common/webblobregistry_impl.cc b/content/common/webblobregistry_impl.cc index 53d7a74..55f902e 100644 --- a/content/common/webblobregistry_impl.cc +++ b/content/common/webblobregistry_impl.cc @@ -8,9 +8,9 @@ #include "base/shared_memory.h" #include "content/common/child_thread.h" #include "content/common/webblob_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobData.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "webkit/blob/blob_data.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/common/webblobregistry_impl.h b/content/common/webblobregistry_impl.h index e7b64ae..4079b14 100644 --- a/content/common/webblobregistry_impl.h +++ b/content/common/webblobregistry_impl.h @@ -6,7 +6,7 @@ #define CONTENT_COMMON_WEBBLOBREGISTRY_IMPL_H_ #pragma once -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h" class ChildThread; diff --git a/content/common/webmessageportchannel_impl.cc b/content/common/webmessageportchannel_impl.cc index f7b9489..8e8f8c1 100644 --- a/content/common/webmessageportchannel_impl.cc +++ b/content/common/webmessageportchannel_impl.cc @@ -8,7 +8,7 @@ #include "content/common/child_process.h" #include "content/common/child_thread.h" #include "content/common/worker_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannelClient.h" using WebKit::WebMessagePortChannel; diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc index 366f7e7..e6b3534 100644 --- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc +++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc @@ -13,17 +13,17 @@ #include "content/common/child_process_messages.h" #include "content/common/child_thread.h" #include "ipc/ipc_sync_message_filter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #if defined(OS_WIN) -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebSandboxSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/win/WebSandboxSupport.h" #elif defined(OS_MACOSX) -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h" #elif defined(OS_POSIX) #include "content/common/child_process_sandbox_support_impl_linux.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontFamily.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebSandboxSupport.h" #endif using WebKit::WebSandboxSupport; diff --git a/content/public/common/serialized_script_value.cc b/content/public/common/serialized_script_value.cc index 880d045..92dbee6 100644 --- a/content/public/common/serialized_script_value.cc +++ b/content/public/common/serialized_script_value.cc @@ -4,8 +4,8 @@ #include "content/public/common/serialized_script_value.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebSerializedScriptValue; diff --git a/content/public/common/window_container_type.cc b/content/public/common/window_container_type.cc index d62a082..8673b3a 100644 --- a/content/public/common/window_container_type.cc +++ b/content/public/common/window_container_type.cc @@ -5,8 +5,8 @@ #include "content/public/common/window_container_type.h" #include "base/string_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" namespace { diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h index ee6fa58..e54c37a 100644 --- a/content/public/renderer/document_state.h +++ b/content/public/renderer/document_state.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" namespace webkit_glue { struct PasswordForm; diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc index 7843fc6..68a4b0e 100644 --- a/content/renderer/devtools_agent.cc +++ b/content/renderer/devtools_agent.cc @@ -16,8 +16,8 @@ #include "content/renderer/devtools_client.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" using WebKit::WebDevToolsAgent; diff --git a/content/renderer/devtools_agent_filter.cc b/content/renderer/devtools_agent_filter.cc index 784c5e5..4e42ce3 100644 --- a/content/renderer/devtools_agent_filter.cc +++ b/content/renderer/devtools_agent_filter.cc @@ -10,7 +10,7 @@ #include "content/renderer/devtools_agent.h" #include "content/renderer/plugin_channel_host.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebDevToolsAgent; using WebKit::WebString; diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc index 73731fe..e332bb8 100644 --- a/content/renderer/devtools_client.cc +++ b/content/renderer/devtools_client.cc @@ -12,8 +12,8 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontend.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "ui/base/ui_base_switches.h" using WebKit::WebDevToolsFrontend; diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc index f2deacc..a8c1ea8 100644 --- a/content/renderer/external_popup_menu.cc +++ b/content/renderer/external_popup_menu.cc @@ -7,7 +7,7 @@ #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalPopupMenuClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" ExternalPopupMenu::ExternalPopupMenu( RenderViewImpl* render_view, diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index a1eeed0..1f40dbf 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -7,7 +7,7 @@ #include "content/renderer/render_view_impl.h" #include "content/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" // Tests for the external select popup menu (Mac specific). diff --git a/content/renderer/gamepad_shared_memory_reader.h b/content/renderer/gamepad_shared_memory_reader.h index d8492ab..b1d2eef 100644 --- a/content/renderer/gamepad_shared_memory_reader.h +++ b/content/renderer/gamepad_shared_memory_reader.h @@ -7,7 +7,7 @@ #include "base/shared_memory.h" #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGamepads.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h" namespace content { diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc index 7a5eb65..d745ba4 100644 --- a/content/renderer/geolocation_dispatcher.cc +++ b/content/renderer/geolocation_dispatcher.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationPosition.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebGeolocationController; using WebKit::WebGeolocationError; diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h index ca7e9a9..dc1df39 100644 --- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h +++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h @@ -15,8 +15,8 @@ #include "base/memory/weak_ptr.h" #include "content/renderer/gpu/renderer_gl_context.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc index 2308e8b..414c1a6 100644 --- a/content/renderer/indexed_db_dispatcher.cc +++ b/content/renderer/indexed_db_dispatcher.cc @@ -17,8 +17,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebDOMStringList; using WebKit::WebExceptionCode; diff --git a/content/renderer/intents_dispatcher.cc b/content/renderer/intents_dispatcher.cc index e4e6d69..c63dbb7 100644 --- a/content/renderer/intents_dispatcher.cc +++ b/content/renderer/intents_dispatcher.cc @@ -10,9 +10,9 @@ #include "content/renderer/render_view_impl.h" #include "ipc/ipc_message.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "v8/include/v8.h" #include "webkit/glue/cpp_bound_class.h" diff --git a/content/renderer/intents_dispatcher.h b/content/renderer/intents_dispatcher.h index f49e897..0d4a2ad 100644 --- a/content/renderer/intents_dispatcher.h +++ b/content/renderer/intents_dispatcher.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_reply_data.h" diff --git a/content/renderer/mhtml_generator.cc b/content/renderer/mhtml_generator.cc index 0102b8f..6b641d5 100644 --- a/content/renderer/mhtml_generator.cc +++ b/content/renderer/mhtml_generator.cc @@ -7,7 +7,7 @@ #include "base/platform_file.h" #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" MHTMLGenerator::MHTMLGenerator(RenderViewImpl* render_view) diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc index 337d7cc..36e6759 100644 --- a/content/renderer/notification_provider.cc +++ b/content/renderer/notification_provider.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPermissionCallback.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" using WebKit::WebDocument; diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index 2146b9c..16201b0 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc @@ -13,11 +13,11 @@ #include "net/base/ip_endpoint.h" #include "ppapi/c/dev/ppb_transport_dev.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoader.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" using WebKit::WebString; using WebKit::WebURL; diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h index e25fbd5..7f2ab4b 100644 --- a/content/renderer/p2p/port_allocator.h +++ b/content/renderer/p2p/port_allocator.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "net/base/net_util.h" #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h" #include "webkit/glue/p2p_transport.h" namespace WebKit { diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index a527751..219d4f0 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -57,7 +57,7 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColor.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebColor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" @@ -68,7 +68,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/base/ui_base_switches.h" #include "v8/include/v8.h" diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index cd44837..050662e 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -13,8 +13,8 @@ #include "content/test/render_view_test.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/range/range.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index a851301..62e2589 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -85,10 +85,10 @@ #include "net/http/http_util.h" #include "ppapi/c/private/ppb_flash_net_connector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" @@ -96,9 +96,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebImage.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIntent.h" @@ -110,23 +110,23 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSearchableFormData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index fdb6aab..f0474906 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -34,7 +34,7 @@ #include "content/renderer/render_widget.h" #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 98da1c2..cd50991 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -24,14 +24,14 @@ #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkShader.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" #include "ui/gfx/surface/transport_dib.h" diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 255bb09..b091c96 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -18,7 +18,7 @@ #include "ipc/ipc_channel.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 95ac902..11f4fc1 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -12,7 +12,7 @@ #include "content/renderer/render_thread_impl.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" #include "ui/gfx/gl/gpu_preference.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/content/renderer/renderer_webaudiodevice_impl.h b/content/renderer/renderer_webaudiodevice_impl.h index 05f301c..d07c0e2 100644 --- a/content/renderer/renderer_webaudiodevice_impl.h +++ b/content/renderer/renderer_webaudiodevice_impl.h @@ -9,8 +9,8 @@ #include "base/memory/ref_counted.h" #include "content/renderer/media/audio_device.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioDevice.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioDevice.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" class RendererWebAudioDeviceImpl : public WebKit::WebAudioDevice, public AudioDevice::RenderCallback { diff --git a/content/renderer/renderer_webcookiejar_impl.cc b/content/renderer/renderer_webcookiejar_impl.cc index 56c0e0f..2a83ac0 100644 --- a/content/renderer/renderer_webcookiejar_impl.cc +++ b/content/renderer/renderer_webcookiejar_impl.cc @@ -8,7 +8,7 @@ #include "content/common/view_messages.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCookie.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookie.h" #include "webkit/glue/webcookie.h" using WebKit::WebCookie; diff --git a/content/renderer/renderer_webcookiejar_impl.h b/content/renderer/renderer_webcookiejar_impl.h index eb0f4f1..877bcbf 100644 --- a/content/renderer/renderer_webcookiejar_impl.h +++ b/content/renderer/renderer_webcookiejar_impl.h @@ -7,8 +7,8 @@ #pragma once // TODO(darin): WebCookieJar.h is missing a WebString.h include! -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCookieJar.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookieJar.h" class RenderViewImpl; diff --git a/content/renderer/renderer_webidbcursor_impl.h b/content/renderer/renderer_webidbcursor_impl.h index b033990..fb161e6 100644 --- a/content/renderer/renderer_webidbcursor_impl.h +++ b/content/renderer/renderer_webidbcursor_impl.h @@ -13,7 +13,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor { public: diff --git a/content/renderer/renderer_webidbdatabase_impl.cc b/content/renderer/renderer_webidbdatabase_impl.cc index bb230e0..79fc28b 100644 --- a/content/renderer/renderer_webidbdatabase_impl.cc +++ b/content/renderer/renderer_webidbdatabase_impl.cc @@ -9,8 +9,8 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/renderer_webidbobjectstore_impl.h" #include "content/renderer/renderer_webidbtransaction_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" using WebKit::WebDOMStringList; using WebKit::WebExceptionCode; diff --git a/content/renderer/renderer_webidbfactory_impl.cc b/content/renderer/renderer_webidbfactory_impl.cc index d382f11..b84cf29 100644 --- a/content/renderer/renderer_webidbfactory_impl.cc +++ b/content/renderer/renderer_webidbfactory_impl.cc @@ -7,7 +7,7 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/indexed_db_dispatcher.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebDOMStringList; using WebKit::WebFrame; diff --git a/content/renderer/renderer_webidbfactory_impl.h b/content/renderer/renderer_webidbfactory_impl.h index a26d1ba..9b084fa 100644 --- a/content/renderer/renderer_webidbfactory_impl.h +++ b/content/renderer/renderer_webidbfactory_impl.h @@ -8,7 +8,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" namespace WebKit { class WebFrame; diff --git a/content/renderer/renderer_webidbindex_impl.cc b/content/renderer/renderer_webidbindex_impl.cc index 1ec237b..89b5255 100644 --- a/content/renderer/renderer_webidbindex_impl.cc +++ b/content/renderer/renderer_webidbindex_impl.cc @@ -8,8 +8,8 @@ #include "content/renderer/indexed_db_dispatcher.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/renderer_webidbtransaction_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" using WebKit::WebExceptionCode; using WebKit::WebDOMStringList; diff --git a/content/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/renderer_webidbobjectstore_impl.cc index 94a0a48..734314b 100644 --- a/content/renderer/renderer_webidbobjectstore_impl.cc +++ b/content/renderer/renderer_webidbobjectstore_impl.cc @@ -14,8 +14,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebDOMStringList; using WebKit::WebExceptionCode; diff --git a/content/renderer/renderer_webidbtransaction_impl.cc b/content/renderer/renderer_webidbtransaction_impl.cc index d783576..1d49c8d 100644 --- a/content/renderer/renderer_webidbtransaction_impl.cc +++ b/content/renderer/renderer_webidbtransaction_impl.cc @@ -10,7 +10,7 @@ #include "content/renderer/renderer_webidbobjectstore_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebIDBObjectStore; using WebKit::WebIDBTransactionCallbacks; diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 55d07f6..d687adc 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -32,17 +32,17 @@ #include "content/renderer/websharedworkerrepository_impl.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_sync_message_filter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGamepads.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGraphicsContext3D.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webfileutilities_impl.h" @@ -51,13 +51,13 @@ #if defined(OS_WIN) #include "content/common/child_process_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebSandboxSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/win/WebSandboxSupport.h" #endif #if defined(OS_MACOSX) #include "content/common/mac/font_descriptor.h" #include "content/common/mac/font_loader.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h" #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -66,8 +66,8 @@ #include "base/synchronization/lock.h" #include "content/common/child_process_sandbox_support_impl_linux.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontFamily.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebSandboxSupport.h" #endif #if defined(OS_POSIX) diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc index f898667..4dd474b 100644 --- a/content/renderer/renderer_webstoragearea_impl.cc +++ b/content/renderer/renderer_webstoragearea_impl.cc @@ -9,7 +9,7 @@ #include "content/common/dom_storage_messages.h" #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" using WebKit::WebStorageNamespace; using WebKit::WebString; diff --git a/content/renderer/renderer_webstoragearea_impl.h b/content/renderer/renderer_webstoragearea_impl.h index 62746e3..d19c78d 100644 --- a/content/renderer/renderer_webstoragearea_impl.h +++ b/content/renderer/renderer_webstoragearea_impl.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" class RendererWebStorageAreaImpl : public WebKit::WebStorageArea { public: diff --git a/content/renderer/speech_input_dispatcher.cc b/content/renderer/speech_input_dispatcher.cc index 32f1738..d42083f 100644 --- a/content/renderer/speech_input_dispatcher.cc +++ b/content/renderer/speech_input_dispatcher.cc @@ -12,10 +12,10 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputListener.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" using WebKit::WebDocument; diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc index 432186c..17239b7 100644 --- a/content/renderer/text_input_client_observer.cc +++ b/content/renderer/text_input_client_observer.cc @@ -10,9 +10,9 @@ #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSubstringUtil.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/rect.h" diff --git a/content/renderer/web_ui_bindings.cc b/content/renderer/web_ui_bindings.cc index 71198e9..9427a36 100644 --- a/content/renderer/web_ui_bindings.cc +++ b/content/renderer/web_ui_bindings.cc @@ -12,7 +12,7 @@ #include "content/common/view_messages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" namespace { diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 4d57b17..b638a20 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -39,9 +39,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/blit.h" #include "ui/gfx/canvas_skia.h" diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc index d3b74d5..0535f8c4 100644 --- a/content/renderer/websharedworker_proxy.cc +++ b/content/renderer/websharedworker_proxy.cc @@ -7,7 +7,7 @@ #include "content/common/view_messages.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h" WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread, diff --git a/content/test/render_view_fake_resources_test.cc b/content/test/render_view_fake_resources_test.cc index b35d4e9..d8769c1 100644 --- a/content/test/render_view_fake_resources_test.cc +++ b/content/test/render_view_fake_resources_test.cc @@ -22,8 +22,8 @@ #include "net/url_request/url_request_status.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/glue_serialize.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/test/render_view_test.cc b/content/test/render_view_test.cc index 0ddf798..5d60fc5 100644 --- a/content/test/render_view_test.cc +++ b/content/test/render_view_test.cc @@ -16,7 +16,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/test/render_widget_browsertest.cc b/content/test/render_widget_browsertest.cc index a81cb9a..6f85dba 100644 --- a/content/test/render_widget_browsertest.cc +++ b/content/test/render_widget_browsertest.cc @@ -13,7 +13,7 @@ #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/size.h" diff --git a/content/test/unittest_test_suite.cc b/content/test/unittest_test_suite.cc index 932229a..b8eaf43 100644 --- a/content/test/unittest_test_suite.cc +++ b/content/test/unittest_test_suite.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/test/test_suite.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h" // A stubbed out WebKit platform support impl. class UnitTestTestSuite::UnitTestWebKitPlatformSupport diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index e909224..2ccb774 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -16,7 +16,7 @@ #include "content/public/utility/content_utility_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h" #include "webkit/glue/idb_bindings.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/content/worker/shared_worker_devtools_agent.cc b/content/worker/shared_worker_devtools_agent.cc index 9e897575..ec23350 100644 --- a/content/worker/shared_worker_devtools_agent.cc +++ b/content/worker/shared_worker_devtools_agent.cc @@ -6,9 +6,9 @@ #include "content/common/devtools_messages.h" #include "content/worker/worker_thread.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" using WebKit::WebSharedWorker; using WebKit::WebString; diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 8168740..8b29305 100644 --- a/content/worker/websharedworker_stub.cc +++ b/content/worker/websharedworker_stub.cc @@ -13,8 +13,8 @@ #include "content/worker/worker_thread.h" #include "content/worker/shared_worker_devtools_agent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" WebSharedWorkerStub::WebSharedWorkerStub( const string16& name, int route_id, diff --git a/content/worker/webworkerclient_proxy.cc b/content/worker/webworkerclient_proxy.cc index 529a602..9365340 100644 --- a/content/worker/webworkerclient_proxy.cc +++ b/content/worker/webworkerclient_proxy.cc @@ -25,8 +25,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h" using WebKit::WebApplicationCacheHost; diff --git a/content/worker/webworkerclient_proxy.h b/content/worker/webworkerclient_proxy.h index 3b47df6..f614a76 100644 --- a/content/worker/webworkerclient_proxy.h +++ b/content/worker/webworkerclient_proxy.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "ipc/ipc_channel.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h" namespace WebKit { diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc index b26cf32..2428ea3 100644 --- a/content/worker/worker_thread.cc +++ b/content/worker/worker_thread.cc @@ -15,7 +15,7 @@ #include "content/worker/websharedworker_stub.h" #include "content/worker/worker_webkitplatformsupport_impl.h" #include "ipc/ipc_sync_channel.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc index 24ded4f..d37621a 100644 --- a/content/worker/worker_webkitplatformsupport_impl.cc +++ b/content/worker/worker_webkitplatformsupport_impl.cc @@ -15,9 +15,9 @@ #include "content/worker/worker_thread.h" #include "ipc/ipc_sync_message_filter.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebBlobRegistry.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "webkit/glue/webfileutilities_impl.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h index 2d0715d..38435ec 100644 --- a/content/worker/worker_webkitplatformsupport_impl.h +++ b/content/worker/worker_webkitplatformsupport_impl.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "content/common/webkitplatformsupport_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMimeRegistry.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMimeRegistry.h" class WebFileSystemImpl; |