diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 05:12:31 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-17 05:12:31 +0000 |
| commit | 2255a9339bdc413c4c11b39a511e4a49871b0ed2 (patch) | |
| tree | 386bcab083b6163307be2310b878529d373a1948 /content | |
| parent | 1071fafce2c9d9158ce34db59873144a50e298bf (diff) | |
| download | chromium_src-2255a9339bdc413c4c11b39a511e4a49871b0ed2.zip chromium_src-2255a9339bdc413c4c11b39a511e4a49871b0ed2.tar.gz chromium_src-2255a9339bdc413c4c11b39a511e4a49871b0ed2.tar.bz2 | |
Update Blink include paths
This CL changes the majority of include paths from the old
Source/WebKit/chromium/public to the new public/web directory.
TBR=darin
BUG=239545
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/17148003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
238 files changed, 540 insertions, 540 deletions
diff --git a/content/DEPS b/content/DEPS index 75b4f32..32a2737 100644 --- a/content/DEPS +++ b/content/DEPS @@ -74,7 +74,7 @@ include_rules = [ "+third_party/webrtc", "+third_party/zlib/google", "+third_party/WebKit/public/platform", - "+third_party/WebKit/Source/WebKit/chromium", + "+third_party/WebKit/public/web", "+ui/android", # Aura is analogous to Win32 or a Gtk, so it is allowed. diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 72aad39..f3d2bb0 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -42,9 +42,9 @@ #include "content/public/common/content_switches.h" #include "content/public/common/page_transition_types.h" #include "jni/ContentViewCore_jni.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/android/WebInputEventFactory.h" #include "ui/android/view_android.h" #include "ui/android/window_android.h" #include "ui/gfx/android/java_bitmap.h" diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h index 4581e69..e8b1e4e 100644 --- a/content/browser/android/content_view_core_impl.h +++ b/content/browser/android/content_view_core_impl.h @@ -20,7 +20,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/rect.h" #include "ui/gfx/rect_f.h" diff --git a/content/browser/android/touch_point.h b/content/browser/android/touch_point.h index 278ddc5..8e9971ba 100644 --- a/content/browser/android/touch_point.h +++ b/content/browser/android/touch_point.h @@ -7,7 +7,7 @@ #include <jni.h> -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace content { diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h index 0ba85c4..ccc4544 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.h +++ b/content/browser/browser_plugin/browser_plugin_embedder.h @@ -19,7 +19,7 @@ #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" struct BrowserPluginHostMsg_Attach_Params; struct BrowserPluginHostMsg_ResizeGuest_Params; diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 5393689..f4a542a 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -43,7 +43,7 @@ #include "content/public/common/result_codes.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/surface/transport_dib.h" #include "webkit/common/webdropdata.h" diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h index d831493..fe3f2e1 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.h +++ b/content/browser/browser_plugin/browser_plugin_guest.h @@ -37,9 +37,9 @@ #include "content/public/browser/render_view_host_observer.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragStatus.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragStatus.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/rect.h" #include "ui/surface/transport_dib.h" diff --git a/content/browser/browser_plugin/browser_plugin_guest_helper.h b/content/browser/browser_plugin/browser_plugin_guest_helper.h index cb938c62..dfe2e32 100644 --- a/content/browser/browser_plugin/browser_plugin_guest_helper.h +++ b/content/browser/browser_plugin/browser_plugin_guest_helper.h @@ -8,8 +8,8 @@ #include "content/port/common/input_event_ack_state.h" #include "content/public/browser/render_view_host_observer.h" #include "content/public/browser/notification_registrar.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" class WebCursor; #if defined(OS_MACOSX) diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index f1670cc..adcb948 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -33,7 +33,7 @@ #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" #include "net/test/spawned_test_server/spawned_test_server.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "webkit/common/webdropdata.h" using WebKit::WebInputEvent; diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc index e39ca37..01c9fd6 100644 --- a/content/browser/devtools/devtools_http_handler_impl.cc +++ b/content/browser/devtools/devtools_http_handler_impl.cc @@ -45,7 +45,7 @@ #include "net/base/ip_endpoint.h" #include "net/server/http_server_request_info.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/public/web/WebDevToolsAgent.h" #include "ui/base/layout.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/user_agent/user_agent_util.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index 594e394..014e687 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -43,7 +43,7 @@ #include "net/base/mime_util.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h" +#include "third_party/WebKit/public/web/WebPageSerializerClient.h" using base::Time; using WebKit::WebPageSerializerClient; diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc index 89784e3..f0b8fa4 100644 --- a/content/browser/in_process_webkit/webkit_thread.cc +++ b/content/browser/in_process_webkit/webkit_thread.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h" #include "content/public/common/content_switches.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "webkit/glue/webkit_glue.h" namespace content { diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index f4a9737..314ce23 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc @@ -12,7 +12,7 @@ #include "content/browser/indexed_db/indexed_db_factory.h" #include "content/browser/indexed_db/indexed_db_leveldb_coding.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" using WebKit::WebSecurityOrigin; using WebKit::WebIDBKey; diff --git a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc index 244ed5e..6d52e8a 100644 --- a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc +++ b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc @@ -9,7 +9,7 @@ #include "content/browser/indexed_db/indexed_db_backing_store.h" #include "content/browser/indexed_db/leveldb/leveldb_database.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" using WebKit::WebSecurityOrigin; using content::IndexedDBBackingStore; diff --git a/content/browser/renderer_host/gesture_event_filter.h b/content/browser/renderer_host/gesture_event_filter.h index 636ab80..251aef6 100644 --- a/content/browser/renderer_host/gesture_event_filter.h +++ b/content/browser/renderer_host/gesture_event_filter.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/timer.h" #include "content/browser/renderer_host/event_with_latency_info.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/transform.h" namespace content { diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.cc b/content/browser/renderer_host/gtk_im_context_wrapper.cc index c20ec11..646064f 100644 --- a/content/browser/renderer_host/gtk_im_context_wrapper.cc +++ b/content/browser/renderer_host/gtk_im_context_wrapper.cc @@ -16,7 +16,7 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_gtk.h" #include "content/public/browser/native_web_keyboard_event.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" #include "ui/base/gtk/gtk_im_context_util.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/rect.h" diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.h b/content/browser/renderer_host/gtk_im_context_wrapper.h index 13b1148..9f13551 100644 --- a/content/browser/renderer_host/gtk_im_context_wrapper.h +++ b/content/browser/renderer_host/gtk_im_context_wrapper.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/strings/string16.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_type.h" diff --git a/content/browser/renderer_host/gtk_window_utils.cc b/content/browser/renderer_host/gtk_window_utils.cc index c47972a..67bf24f 100644 --- a/content/browser/renderer_host/gtk_window_utils.cc +++ b/content/browser/renderer_host/gtk_window_utils.cc @@ -12,8 +12,8 @@ #include "ui/base/gtk/gtk_compat.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/rect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFactory.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" +#include "third_party/WebKit/public/web/x11/WebScreenInfoFactory.h" namespace content { diff --git a/content/browser/renderer_host/ime_adapter_android.cc b/content/browser/renderer_host/ime_adapter_android.cc index fccd877..95dc541 100644 --- a/content/browser/renderer_host/ime_adapter_android.cc +++ b/content/browser/renderer_host/ime_adapter_android.cc @@ -16,8 +16,8 @@ #include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" #include "jni/ImeAdapter_jni.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; diff --git a/content/browser/renderer_host/java/java_bound_object.cc b/content/browser/renderer_host/java/java_bound_object.cc index b253515..4199cca 100644 --- a/content/browser/renderer_host/java/java_bound_object.cc +++ b/content/browser/renderer_host/java/java_bound_object.cc @@ -12,7 +12,7 @@ #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h" #include "content/browser/renderer_host/java/java_type.h" #include "content/public/browser/browser_thread.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" using base::StringPrintf; using base::android::AttachCurrentThread; diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc index 4f1a295..c47414b 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc @@ -15,7 +15,7 @@ #include "content/common/java_bridge_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" namespace content { diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc index 3ffc1cd..bac3856 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc @@ -14,7 +14,7 @@ #include "content/browser/renderer_host/java/java_bridge_dispatcher_host.h" #include "content/common/android/hash_set.h" #include "content/public/browser/browser_thread.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" namespace content { diff --git a/content/browser/renderer_host/native_web_keyboard_event_android.cc b/content/browser/renderer_host/native_web_keyboard_event_android.cc index 4ddc7f3..669ed0c 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_android.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_android.cc @@ -5,7 +5,7 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "base/android/jni_android.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/android/WebInputEventFactory.h" #include "ui/gfx/native_widget_types.h" using WebKit::WebInputEventFactory; diff --git a/content/browser/renderer_host/native_web_keyboard_event_gtk.cc b/content/browser/renderer_host/native_web_keyboard_event_gtk.cc index 5aee868..f763194 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_gtk.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_gtk.cc @@ -6,7 +6,7 @@ #include <gdk/gdk.h> -#include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/gtk/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/content/browser/renderer_host/native_web_keyboard_event_mac.mm b/content/browser/renderer_host/native_web_keyboard_event_mac.mm index f2c8bbd..5b4f38c 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_mac.mm +++ b/content/browser/renderer_host/native_web_keyboard_event_mac.mm @@ -6,7 +6,7 @@ #import <AppKit/AppKit.h> -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/mac/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/content/browser/renderer_host/native_web_keyboard_event_win.cc b/content/browser/renderer_host/native_web_keyboard_event_win.cc index 795c210..4a800a0 100644 --- a/content/browser/renderer_host/native_web_keyboard_event_win.cc +++ b/content/browser/renderer_host/native_web_keyboard_event_win.cc @@ -4,7 +4,7 @@ #include "content/public/browser/native_web_keyboard_event.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/win/WebInputEventFactory.h" using WebKit::WebInputEventFactory; using WebKit::WebKeyboardEvent; diff --git a/content/browser/renderer_host/overscroll_controller.h b/content/browser/renderer_host/overscroll_controller.h index 39d15dc..f572276 100644 --- a/content/browser/renderer_host/overscroll_controller.h +++ b/content/browser/renderer_host/overscroll_controller.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace ui { struct LatencyInfo; diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 49dfbd2..58b53ae 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -60,7 +60,7 @@ #include "net/http/http_cache.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/public/web/WebNotificationPresenter.h" #include "ui/gfx/color_profile.h" #include "webkit/glue/webcookie.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index d3a0782..a5fea1f 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -25,7 +25,7 @@ #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h" #include "net/cookies/canonical_cookie.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" +#include "third_party/WebKit/public/web/WebPopupType.h" #include "ui/gfx/native_widget_types.h" #include "ui/surface/transport_dib.h" diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 3512cdd..d659e8a 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -31,8 +31,8 @@ #include "content/common/font_config_ipc_linux.h" #include "content/common/sandbox_linux.h" #include "skia/ext/skia_utils_base.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontInfo.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/linux/WebFontInfo.h" #include "third_party/npapi/bindings/npapi_extensions.h" #include "third_party/skia/include/ports/SkFontConfigInterface.h" #include "ui/gfx/font_render_params_linux.h" diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index ec6154a..00ef739 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -17,7 +17,7 @@ #include "content/public/common/javascript_message_type.h" #include "content/public/common/media_stream_request.h" #include "net/base/load_states.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" +#include "third_party/WebKit/public/web/WebPopupType.h" #include "ui/base/window_open_disposition.h" class GURL; diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 3401b40..a94d2a5 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -74,7 +74,7 @@ #if defined(OS_WIN) #include "base/win/windows_version.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h" +#include "third_party/WebKit/public/web/win/WebScreenInfoFactory.h" #elif defined(OS_MACOSX) #include "content/browser/renderer_host/popup_menu_helper_mac.h" #elif defined(OS_ANDROID) diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 373d47c..2e76a71 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -26,9 +26,9 @@ #include "content/public/common/window_container_type.h" #include "net/base/load_states.h" #include "third_party/skia/include/core/SkColor.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebPopupType.h" +#include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/base/window_open_disposition.h" class SkBitmap; diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index ff7677c..2a1f5ee 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -18,7 +18,7 @@ #include "content/test/test_content_browser_client.h" #include "content/test/test_web_contents.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "webkit/common/webdropdata.h" namespace content { diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h index e6a2961..8a462c5 100644 --- a/content/browser/renderer_host/render_widget_helper.h +++ b/content/browser/renderer_host/render_widget_helper.h @@ -18,7 +18,7 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/browser/global_request_id.h" #include "content/public/common/window_container_type.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" +#include "third_party/WebKit/public/web/WebPopupType.h" #include "ui/gfx/native_widget_types.h" #include "ui/surface/transport_dib.h" diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 2c6e4c0..922a1e9 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -51,9 +51,9 @@ #include "content/public/common/result_codes.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" #if defined(OS_WIN) -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h" +#include "third_party/WebKit/public/web/win/WebScreenInfoFactory.h" #endif #include "ui/base/events/event.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 48c93b2..d909d13 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -36,9 +36,9 @@ #include "content/public/browser/user_metrics.h" #include "content/public/common/content_switches.h" #include "media/base/video_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/cursor_client.h" diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc index 05bafff..9e5a2c4 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc @@ -11,7 +11,7 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/port/browser/render_widget_host_view_frame_subscriber.h" #include "content/port/browser/smooth_scroll_gesture.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc index e348b1e..c5a56d5 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc @@ -37,10 +37,10 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/common/content_switches.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFactory.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" +#include "third_party/WebKit/public/web/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/x11/WebScreenInfoFactory.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/gtk/gtk_compat.h" #include "ui/base/text/text_elider.h" diff --git a/content/browser/renderer_host/render_widget_host_view_guest.cc b/content/browser/renderer_host/render_widget_host_view_guest.cc index 21e8aef..298765b 100644 --- a/content/browser/renderer_host/render_widget_host_view_guest.cc +++ b/content/browser/renderer_host/render_widget_host_view_guest.cc @@ -17,7 +17,7 @@ #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" #include "webkit/plugins/npapi/webplugin.h" namespace content { diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h index 2ba436a..d4c529d 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.h +++ b/content/browser/renderer_host/render_widget_host_view_mac.h @@ -21,7 +21,7 @@ #include "content/common/edit_command.h" #import "content/public/browser/render_widget_host_view_mac_base.h" #include "ipc/ipc_sender.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" #include "ui/base/cocoa/base_view.h" #include "webkit/common/cursors/webcursor.h" diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index ff58dae..7949076 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -44,10 +44,10 @@ #import "content/public/browser/render_widget_host_view_mac_delegate.h" #include "content/public/common/content_switches.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" +#include "third_party/WebKit/public/web/mac/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/mac/WebScreenInfoFactory.h" #import "third_party/mozilla/ComplexTextInputPanel.h" #include "ui/base/cocoa/animation_utils.h" #import "ui/base/cocoa/fullscreen_window_manager.h" diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index c6df8c1..f697c51 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -51,10 +51,10 @@ #include "content/public/common/page_zoom.h" #include "content/public/common/process_type.h" #include "skia/ext/skia_utils_win.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebScreenInfoFactory.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/win/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/win/WebScreenInfoFactory.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/base/events/event.h" #include "ui/base/events/event_utils.h" diff --git a/content/browser/renderer_host/touch_event_queue.h b/content/browser/renderer_host/touch_event_queue.h index 3bd90fc..24be495 100644 --- a/content/browser/renderer_host/touch_event_queue.h +++ b/content/browser/renderer_host/touch_event_queue.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "content/common/content_export.h" #include "content/port/common/input_event_ack_state.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace content { diff --git a/content/browser/renderer_host/touchpad_tap_suppression_controller.h b/content/browser/renderer_host/touchpad_tap_suppression_controller.h index e2ce4c9..b6fb924 100644 --- a/content/browser/renderer_host/touchpad_tap_suppression_controller.h +++ b/content/browser/renderer_host/touchpad_tap_suppression_controller.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "content/browser/renderer_host/event_with_latency_info.h" #include "content/browser/renderer_host/tap_suppression_controller_client.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace content { diff --git a/content/browser/renderer_host/ui_events_helper.cc b/content/browser/renderer_host/ui_events_helper.cc index fedb641..95292a2 100644 --- a/content/browser/renderer_host/ui_events_helper.cc +++ b/content/browser/renderer_host/ui_events_helper.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/ui_events_helper.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/events/event.h" #include "ui/base/events/event_constants.h" diff --git a/content/browser/renderer_host/web_input_event_aura.h b/content/browser/renderer_host/web_input_event_aura.h index e32a722..ddc59e0 100644 --- a/content/browser/renderer_host/web_input_event_aura.h +++ b/content/browser/renderer_host/web_input_event_aura.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_WEB_INPUT_EVENT_AURA_H_ #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace ui { class GestureEvent; diff --git a/content/browser/renderer_host/web_input_event_aurawin.cc b/content/browser/renderer_host/web_input_event_aurawin.cc index 3b0f059..4264c00 100644 --- a/content/browser/renderer_host/web_input_event_aurawin.cc +++ b/content/browser/renderer_host/web_input_event_aurawin.cc @@ -6,7 +6,7 @@ #include "base/event_types.h" #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/public/web/win/WebInputEventFactory.h" namespace content { diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc index 8e4d193..83c3d28 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. // Portions based heavily on: -// third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp +// third_party/WebKit/public/web/gtk/WebInputEventFactory.cpp // /* * Copyright (C) 2006-2011 Google Inc. All rights reserved. diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index 89be748..8c7eaae 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -21,7 +21,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace content { diff --git a/content/browser/web_contents/drag_utils_gtk.h b/content/browser/web_contents/drag_utils_gtk.h index cc8122b..7232df1 100644 --- a/content/browser/web_contents/drag_utils_gtk.h +++ b/content/browser/web_contents/drag_utils_gtk.h @@ -8,7 +8,7 @@ #include <gtk/gtk.h> #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" namespace content { diff --git a/content/browser/web_contents/web_contents_drag_win.h b/content/browser/web_contents/web_contents_drag_win.h index b7ffb30..42d2c68 100644 --- a/content/browser/web_contents/web_contents_drag_win.h +++ b/content/browser/web_contents/web_contents_drag_win.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 4d36568..668caf6 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -79,7 +79,7 @@ #include "net/base/net_util.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request_context_getter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/base/layout.h" #include "ui/base/touch/touch_device.h" #include "ui/base/ui_base_switches.h" diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index e4667a7..e1db4deb 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -26,7 +26,7 @@ #include "content/public/common/renderer_preferences.h" #include "content/public/common/three_d_api_types.h" #include "net/base/load_states.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/gfx/rect_f.h" #include "ui/gfx/size.h" #include "ui/gfx/vector2d.h" diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 9bb7f27..cbf23fc 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -31,7 +31,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_view_delegate.h" #include "content/public/browser/web_drag_dest_delegate.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/client/drag_drop_delegate.h" diff --git a/content/browser/web_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc index ef63ba9..1e57716 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.cc +++ b/content/browser/web_contents/web_drag_dest_gtk.cc @@ -17,7 +17,7 @@ #include "content/public/browser/web_drag_dest_delegate.h" #include "content/public/common/url_constants.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/clipboard/custom_data_helper.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/gtk/gtk_screen_util.h" diff --git a/content/browser/web_contents/web_drag_dest_gtk.h b/content/browser/web_contents/web_drag_dest_gtk.h index 1e0c8ad..8b954b9 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.h +++ b/content/browser/web_contents/web_drag_dest_gtk.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/base/gtk/gtk_signal.h" #include "webkit/common/webdropdata.h" diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm index 096c139..6e89318 100644 --- a/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm @@ -12,7 +12,7 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_drag_dest_delegate.h" #import "third_party/mozilla/NSPasteboard+Utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/clipboard/custom_data_helper.h" #import "ui/base/dragdrop/cocoa_dnd_util.h" #include "ui/base/window_open_disposition.h" diff --git a/content/browser/web_contents/web_drag_dest_win.cc b/content/browser/web_contents/web_drag_dest_win.cc index 4b02ab4..1aadc95 100644 --- a/content/browser/web_contents/web_drag_dest_win.cc +++ b/content/browser/web_contents/web_drag_dest_win.cc @@ -15,7 +15,7 @@ #include "content/public/browser/web_drag_dest_delegate.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/clipboard/clipboard_util_win.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" diff --git a/content/browser/web_contents/web_drag_dest_win.h b/content/browser/web_contents/web_drag_dest_win.h index 5e8f024..89c0027 100644 --- a/content/browser/web_contents/web_drag_dest_win.h +++ b/content/browser/web_contents/web_drag_dest_win.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/base/dragdrop/drop_target_win.h" #include "webkit/common/webdropdata.h" diff --git a/content/browser/web_contents/web_drag_source_gtk.h b/content/browser/web_contents/web_drag_source_gtk.h index d65b113..dd3d5b4 100644 --- a/content/browser/web_contents/web_drag_source_gtk.h +++ b/content/browser/web_contents/web_drag_source_gtk.h @@ -14,7 +14,7 @@ #include "content/common/content_export.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/browser/web_contents/web_drag_utils_win.h b/content/browser/web_contents/web_drag_utils_win.h index 051da34..8721da9 100644 --- a/content/browser/web_contents/web_drag_utils_win.h +++ b/content/browser/web_contents/web_drag_utils_win.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_UTILS_WIN_H_ #define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_UTILS_WIN_H_ -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include <windows.h> diff --git a/content/child/fileapi/webfilesystem_callback_adapters.cc b/content/child/fileapi/webfilesystem_callback_adapters.cc index b061a22..b790dcc 100644 --- a/content/child/fileapi/webfilesystem_callback_adapters.cc +++ b/content/child/fileapi/webfilesystem_callback_adapters.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc index 97835e8..e05ded3 100644 --- a/content/child/fileapi/webfilesystem_impl.cc +++ b/content/child/fileapi/webfilesystem_impl.cc @@ -9,7 +9,7 @@ #include "content/child/fileapi/file_system_dispatcher.h" #include "content/child/fileapi/webfilesystem_callback_adapters.h" #include "content/child/fileapi/webfilewriter_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/content/child/npobject_proxy.cc b/content/child/npobject_proxy.cc index 0d0b84d..305ce85 100644 --- a/content/child/npobject_proxy.cc +++ b/content/child/npobject_proxy.cc @@ -7,7 +7,7 @@ #include "content/child/np_channel_base.h" #include "content/child/npobject_util.h" #include "content/child/plugin_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_host.h" #include "webkit/plugins/npapi/plugin_instance.h" diff --git a/content/child/npobject_stub.cc b/content/child/npobject_stub.cc index d3ef7a2..4fc60ce 100644 --- a/content/child/npobject_stub.cc +++ b/content/child/npobject_stub.cc @@ -9,7 +9,7 @@ #include "content/child/plugin_messages.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "webkit/plugins/npapi/plugin_host.h" diff --git a/content/child/npobject_util.cc b/content/child/npobject_util.cc index 25e1d7e..80fed0e 100644 --- a/content/child/npobject_util.cc +++ b/content/child/npobject_util.cc @@ -8,7 +8,7 @@ #include "content/child/np_channel_base.h" #include "content/child/npobject_proxy.h" #include "content/child/plugin_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "third_party/npapi/bindings/nphostapi.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/plugin_host.h" diff --git a/content/child/plugin_param_traits.cc b/content/child/plugin_param_traits.cc index 53e75a4..da1b241 100644 --- a/content/child/plugin_param_traits.cc +++ b/content/child/plugin_param_traits.cc @@ -6,7 +6,7 @@ #include "base/strings/string_number_conversions.h" #include "ipc/ipc_message_utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "webkit/glue/npruntime_util.h" #include "webkit/plugins/npapi/plugin_host.h" diff --git a/content/child/quota_dispatcher.cc b/content/child/quota_dispatcher.cc index 5741449..79f0f5e 100644 --- a/content/child/quota_dispatcher.cc +++ b/content/child/quota_dispatcher.cc @@ -8,8 +8,8 @@ #include "content/child/child_thread.h" #include "content/common/quota_messages.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaType.h" +#include "third_party/WebKit/public/web/WebStorageQuotaCallbacks.h" +#include "third_party/WebKit/public/web/WebStorageQuotaType.h" using quota::QuotaStatusCode; using quota::StorageType; diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc index e68a6ec..8e3d389 100644 --- a/content/child/runtime_features.cc +++ b/content/child/runtime_features.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "content/public/common/content_switches.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #if defined(OS_ANDROID) #include <cpu-features.h> diff --git a/content/child/web_database_observer_impl.cc b/content/child/web_database_observer_impl.cc index 265719d..7988228 100644 --- a/content/child/web_database_observer_impl.cc +++ b/content/child/web_database_observer_impl.cc @@ -7,7 +7,7 @@ #include "base/metrics/histogram.h" #include "base/strings/string16.h" #include "content/common/database_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/public/web/WebDatabase.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/sqlite/sqlite3.h" diff --git a/content/child/web_database_observer_impl.h b/content/child/web_database_observer_impl.h index a5b7da3..67631a2 100644 --- a/content/child/web_database_observer_impl.h +++ b/content/child/web_database_observer_impl.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "ipc/ipc_sync_message_filter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabaseObserver.h" +#include "third_party/WebKit/public/web/WebDatabaseObserver.h" #include "webkit/common/database/database_connections.h" namespace content { diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h index 4048f5e..7a8d99d 100644 --- a/content/common/browser_plugin/browser_plugin_messages.h +++ b/content/common/browser_plugin/browser_plugin_messages.h @@ -20,8 +20,8 @@ #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragStatus.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragStatus.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc index 9c21bf0..6ee2f94 100644 --- a/content/common/child_process_sandbox_support_impl_linux.cc +++ b/content/common/child_process_sandbox_support_impl_linux.cc @@ -14,7 +14,7 @@ #include "base/sys_byteorder.h" #include "content/common/sandbox_linux.h" #include "third_party/WebKit/public/platform/linux/WebFontFamily.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h" +#include "third_party/WebKit/public/web/linux/WebFontRenderStyle.h" namespace content { diff --git a/content/common/content_param_traits.cc b/content/common/content_param_traits.cc index 140f388..37810cf 100644 --- a/content/common/content_param_traits.cc +++ b/content/common/content_param_traits.cc @@ -6,7 +6,7 @@ #include "base/strings/string_number_conversions.h" #include "net/base/ip_endpoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "ui/base/range/range.h" namespace { diff --git a/content/common/content_param_traits.h b/content/common/content_param_traits.h index 077eca6..d507302 100644 --- a/content/common/content_param_traits.h +++ b/content/common/content_param_traits.h @@ -15,7 +15,7 @@ #define CONTENT_COMMON_CONTENT_PARAM_TRAITS_H_ #include "content/common/content_param_traits_macros.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "webkit/common/cursors/webcursor.h" namespace net { diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h index 79aa6a7..e7d42ab 100644 --- a/content/common/content_param_traits_macros.h +++ b/content/common/content_param_traits_macros.h @@ -10,7 +10,7 @@ #include "content/common/content_export.h" #include "ipc/ipc_message_macros.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/latency_info.h" #include "webkit/glue/resource_type.h" diff --git a/content/common/db_message_filter.cc b/content/common/db_message_filter.cc index 629486b..7f99cb6 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/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/public/web/WebDatabase.h" namespace content { diff --git a/content/common/drag_messages.h b/content/common/drag_messages.h index 47ec7e3..b297fa2 100644 --- a/content/common/drag_messages.h +++ b/content/common/drag_messages.h @@ -9,7 +9,7 @@ #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/gfx/point.h" #include "ui/gfx/vector2d.h" #include "webkit/common/webdropdata.h" diff --git a/content/common/drag_traits.h b/content/common/drag_traits.h index dd28d13..17306d4 100644 --- a/content/common/drag_traits.h +++ b/content/common/drag_traits.h @@ -5,7 +5,7 @@ #include "content/common/drag_event_source_info.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "ui/gfx/point.h" #include "webkit/common/webdropdata.h" diff --git a/content/common/input_messages.h b/content/common/input_messages.h index ef31299..4da6df5 100644 --- a/content/common/input_messages.h +++ b/content/common/input_messages.h @@ -13,7 +13,7 @@ #include "content/port/common/input_event_ack_state.h" #include "content/public/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/latency_info.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/content/common/view_messages.h b/content/common/view_messages.h index e4cf8e3..835f880 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -36,13 +36,13 @@ #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h" #include "media/base/media_log_event.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginAction.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebFindOptions.h" +#include "third_party/WebKit/public/web/WebMediaPlayerAction.h" +#include "third_party/WebKit/public/web/WebPluginAction.h" +#include "third_party/WebKit/public/web/WebPopupType.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebTextDirection.h" #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebFloatRect.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/common/worker_messages.h b/content/common/worker_messages.h index 4a41930..ea41f65 100644 --- a/content/common/worker_messages.h +++ b/content/common/worker_messages.h @@ -17,7 +17,7 @@ #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/public/web/WebSharedWorker.h" // Singly-included section, not converted. #ifndef CONTENT_COMMON_WORKER_MESSAGES_H_ diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc index 04459f5..afc5022 100644 --- a/content/plugin/webplugin_delegate_stub.cc +++ b/content/plugin/webplugin_delegate_stub.cc @@ -17,8 +17,8 @@ #include "content/public/common/content_constants.h" #include "content/public/common/content_switches.h" #include "skia/ext/platform_device.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "webkit/common/cursors/webcursor.h" diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 3705611..65a8505 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -20,7 +20,7 @@ #include "content/public/common/url_constants.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_device.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" #include "ui/gfx/blit.h" #include "ui/gfx/canvas.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" diff --git a/content/port/browser/render_view_host_delegate_view.h b/content/port/browser/render_view_host_delegate_view.h index 9eced8c..9c859c91 100644 --- a/content/port/browser/render_view_host_delegate_view.h +++ b/content/port/browser/render_view_host_delegate_view.h @@ -11,7 +11,7 @@ #include "content/common/content_export.h" #include "content/common/drag_event_source_info.h" #include "content/public/common/context_menu_source_type.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" class SkBitmap; struct WebDropData; diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h index 805e596..9b14762 100644 --- a/content/port/browser/render_widget_host_view_port.h +++ b/content/port/browser/render_widget_host_view_port.h @@ -13,8 +13,8 @@ #include "content/port/common/input_event_ack_state.h" #include "content/public/browser/render_widget_host_view.h" #include "ipc/ipc_listener.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/public/web/WebPopupType.h" +#include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/range/range.h" #include "ui/surface/transport_dib.h" diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index a65f905..0bf65c2 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -37,7 +37,7 @@ #include "ppapi/proxy/plugin_globals.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/api_id.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/public/web/WebKit.h" #include "ui/base/ui_base_switches.h" #include "webkit/plugins/plugin_switches.h" diff --git a/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java b/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java index f65c6a5..77b5c76 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/SelectionHandleController.java @@ -12,7 +12,7 @@ import android.view.View; public abstract class SelectionHandleController implements CursorController { // The following constants match the ones in - // third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h + // third_party/WebKit/public/web/WebTextDirection.h private static final int TEXT_DIRECTION_DEFAULT = 0; private static final int TEXT_DIRECTION_LTR = 1; private static final int TEXT_DIRECTION_RTL = 2; diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index eb9fc41..bc885f8 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -22,7 +22,7 @@ #include "net/base/mime_util.h" #include "net/cookies/canonical_cookie.h" #include "net/url_request/url_request_job_factory.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/public/web/WebNotificationPresenter.h" #include "webkit/glue/resource_type.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) diff --git a/content/public/browser/native_web_keyboard_event.h b/content/public/browser/native_web_keyboard_event.h index eff2b6c..18c22b8 100644 --- a/content/public/browser/native_web_keyboard_event.h +++ b/content/public/browser/native_web_keyboard_event.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "build/build_config.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/events/event_constants.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index e59f5bc..ecb2fb7 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -10,7 +10,7 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/common/page_zoom.h" #include "content/public/common/stop_find_action.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" class GURL; struct WebDropData; diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index 08a43cf..d58ba8b 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h @@ -11,8 +11,8 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_sender.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/gfx/size.h" #include "ui/surface/transport_dib.h" diff --git a/content/public/browser/render_widget_host_view.h b/content/public/browser/render_widget_host_view.h index 0f39be8..01d9745 100644 --- a/content/public/browser/render_widget_host_view.h +++ b/content/public/browser/render_widget_host_view.h @@ -10,7 +10,7 @@ #include "content/common/content_export.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkRegion.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/gfx/native_widget_types.h" #if defined(TOOLKIT_GTK) diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index 734cafd..392d5f6 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -16,7 +16,7 @@ #include "content/public/common/media_stream_request.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/window_container_type.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/public/web/WebDragOperation.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h index 756c7aa..5704c1a 100644 --- a/content/public/common/context_menu_params.h +++ b/content/public/common/context_menu_params.h @@ -13,7 +13,7 @@ #include "content/public/common/page_state.h" #include "content/public/common/ssl_status.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "webkit/common/webmenuitem.h" diff --git a/content/public/common/page_state_webkit.cc b/content/public/common/page_state_webkit.cc index ee5ca0f..9c6c4ee 100644 --- a/content/public/common/page_state_webkit.cc +++ b/content/public/common/page_state_webkit.cc @@ -6,7 +6,7 @@ #include "third_party/WebKit/public/platform/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/glue_serialize_deprecated.h" diff --git a/content/public/common/show_desktop_notification_params.h b/content/public/common/show_desktop_notification_params.h index 91a29fc..02debd3 100644 --- a/content/public/common/show_desktop_notification_params.h +++ b/content/public/common/show_desktop_notification_params.h @@ -7,7 +7,7 @@ #include "content/common/content_export.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/public/web/WebTextDirection.h" namespace content { diff --git a/content/public/common/window_container_type.cc b/content/public/common/window_container_type.cc index b80e30a..a1099e6 100644 --- a/content/public/common/window_container_type.cc +++ b/content/public/common/window_container_type.cc @@ -7,7 +7,7 @@ #include "base/strings/string_util.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" +#include "third_party/WebKit/public/web/WebWindowFeatures.h" namespace { diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 9718662..ca8171d 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -12,9 +12,9 @@ #include "content/public/common/content_client.h" #include "content/public/common/page_transition_types.h" #include "ipc/ipc_message.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" +#include "third_party/WebKit/public/web/WebNavigationPolicy.h" +#include "third_party/WebKit/public/web/WebNavigationType.h" +#include "third_party/WebKit/public/web/WebPageVisibilityState.h" #include "v8/include/v8.h" class GURL; diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h index 21e0b72..93f6b8a 100644 --- a/content/public/renderer/document_state.h +++ b/content/public/renderer/document_state.h @@ -13,7 +13,7 @@ #include "base/time.h" #include "content/common/content_export.h" #include "net/http/http_response_info.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/public/web/WebDataSource.h" namespace content { diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h index a545cb2..6aa1a08 100644 --- a/content/public/renderer/render_view.h +++ b/content/public/renderer/render_view.h @@ -11,8 +11,8 @@ #include "content/public/common/top_controls_state.h" #include "ipc/ipc_sender.h" #include "skia/ext/refptr.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" +#include "third_party/WebKit/public/web/WebNavigationPolicy.h" +#include "third_party/WebKit/public/web/WebPageVisibilityState.h" #include "ui/gfx/native_widget_types.h" class SkPicture; diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h index c18194b..14c334e 100644 --- a/content/public/renderer/render_view_observer.h +++ b/content/public/renderer/render_view_observer.h @@ -10,7 +10,7 @@ #include "content/common/content_export.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" +#include "third_party/WebKit/public/web/WebIconURL.h" class GURL; diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h index e2fd47f..c728e89 100644 --- a/content/public/test/browser_test_utils.h +++ b/content/public/test/browser_test_utils.h @@ -18,7 +18,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/keycodes/keyboard_codes.h" #if defined(OS_WIN) diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index 8a3ffe8..23e5392 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -10,7 +10,7 @@ #include "ipc/ipc_message_utils.h" #include "ipc/ipc_sync_message.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/public/web/WebScriptController.h" namespace content { diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h index 7f968ef..82e010a 100644 --- a/content/public/test/mock_render_thread.h +++ b/content/public/test/mock_render_thread.h @@ -9,7 +9,7 @@ #include "base/strings/string16.h" #include "content/public/renderer/render_thread.h" #include "ipc/ipc_test_sink.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" +#include "third_party/WebKit/public/web/WebPopupType.h" struct ViewHostMsg_CreateWindow_Params; diff --git a/content/public/test/render_view_fake_resources_test.cc b/content/public/test/render_view_fake_resources_test.cc index ffabb1c..9e0d503 100644 --- a/content/public/test/render_view_fake_resources_test.cc +++ b/content/public/test/render_view_fake_resources_test.cc @@ -25,9 +25,9 @@ #include "net/url_request/url_request_status.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURLRequest.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/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/common/dom_storage/dom_storage_types.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index 5ff01c8..99bdc18 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -16,14 +16,14 @@ #include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "content/test/mock_render_process.h" #include "third_party/WebKit/public/platform/WebURLRequest.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/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.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/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebScriptController.h" +#include "third_party/WebKit/public/web/WebScriptSource.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/common/dom_storage/dom_storage_types.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h index d6b0d38..23eab09 100644 --- a/content/public/test/render_view_test.h +++ b/content/public/test/render_view_test.h @@ -17,7 +17,7 @@ #include "content/public/test/mock_render_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/Platform.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" namespace WebKit { class WebHistoryItem; diff --git a/content/public/test/render_widget_test.cc b/content/public/test/render_widget_test.cc index 1dacf6d..47d61f6 100644 --- a/content/public/test/render_widget_test.cc +++ b/content/public/test/render_widget_test.cc @@ -14,7 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/size.h" #include "ui/surface/transport_dib.h" diff --git a/content/public/test/unittest_test_suite.cc b/content/public/test/unittest_test_suite.cc index 01a73a7..a8d5a25 100644 --- a/content/public/test/unittest_test_suite.cc +++ b/content/public/test/unittest_test_suite.cc @@ -8,7 +8,7 @@ #include "base/rand_util.h" #include "base/test/test_suite.h" #include "third_party/WebKit/public/platform/Platform.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/public/web/WebKit.h" namespace content { diff --git a/content/renderer/accessibility/accessibility_node_serializer.cc b/content/renderer/accessibility/accessibility_node_serializer.cc index bd6e015..f7a9138 100644 --- a/content/renderer/accessibility/accessibility_node_serializer.cc +++ b/content/renderer/accessibility/accessibility_node_serializer.cc @@ -13,15 +13,15 @@ #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityRole.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocumentType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" -#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/public/web/WebAccessibilityObject.h" +#include "third_party/WebKit/public/web/WebAccessibilityRole.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebDocumentType.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFormControlElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebNode.h" using WebKit::WebAccessibilityRole; using WebKit::WebAccessibilityObject; diff --git a/content/renderer/accessibility/accessibility_node_serializer.h b/content/renderer/accessibility/accessibility_node_serializer.h index f0e9525..aaaad7a 100644 --- a/content/renderer/accessibility/accessibility_node_serializer.h +++ b/content/renderer/accessibility/accessibility_node_serializer.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_ACCESSIBILITY_ACCESSIBILITY_NODE_SERIALIZER_H_ #include "content/common/accessibility_node_data.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/public/web/WebAccessibilityObject.h" namespace content { diff --git a/content/renderer/accessibility/renderer_accessibility.cc b/content/renderer/accessibility/renderer_accessibility.cc index 2c24833..8705071 100644 --- a/content/renderer/accessibility/renderer_accessibility.cc +++ b/content/renderer/accessibility/renderer_accessibility.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "content/public/common/content_switches.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.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/WebView.h" +#include "third_party/WebKit/public/web/WebAccessibilityObject.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebAccessibilityNotification; using WebKit::WebAccessibilityObject; diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h index b4b56dd..538f9d4 100644 --- a/content/renderer/accessibility/renderer_accessibility.h +++ b/content/renderer/accessibility/renderer_accessibility.h @@ -7,7 +7,7 @@ #include "content/common/accessibility_messages.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h" +#include "third_party/WebKit/public/web/WebAccessibilityNotification.h" namespace WebKit { class WebAccessibilityObject; diff --git a/content/renderer/accessibility/renderer_accessibility_browsertest.cc b/content/renderer/accessibility/renderer_accessibility_browsertest.cc index f9c526c..d4c1017 100644 --- a/content/renderer/accessibility/renderer_accessibility_browsertest.cc +++ b/content/renderer/accessibility/renderer_accessibility_browsertest.cc @@ -10,9 +10,9 @@ #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebAccessibilityObject.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebAccessibilityObject; using WebKit::WebDocument; diff --git a/content/renderer/accessibility/renderer_accessibility_complete.cc b/content/renderer/accessibility/renderer_accessibility_complete.cc index c8111d3..d346276 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.cc +++ b/content/renderer/accessibility/renderer_accessibility_complete.cc @@ -10,12 +10,12 @@ #include "base/message_loop.h" #include "content/renderer/accessibility/accessibility_node_serializer.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.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/WebInputElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebAccessibilityObject.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebAccessibilityNotification; using WebKit::WebAccessibilityObject; diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h index 979c4b0..82fe4f8 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.h +++ b/content/renderer/accessibility/renderer_accessibility_complete.h @@ -12,7 +12,7 @@ #include "content/common/accessibility_node_data.h" #include "content/public/renderer/render_view_observer.h" #include "content/renderer/accessibility/renderer_accessibility.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h" +#include "third_party/WebKit/public/web/WebAccessibilityNotification.h" namespace WebKit { class WebAccessibilityObject; diff --git a/content/renderer/accessibility/renderer_accessibility_focus_only.cc b/content/renderer/accessibility/renderer_accessibility_focus_only.cc index aab2746..10bb4157 100644 --- a/content/renderer/accessibility/renderer_accessibility_focus_only.cc +++ b/content/renderer/accessibility/renderer_accessibility_focus_only.cc @@ -6,11 +6,11 @@ #include "content/common/accessibility_node_data.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebDocument; using WebKit::WebElement; diff --git a/content/renderer/active_notification_tracker.cc b/content/renderer/active_notification_tracker.cc index 11e16c2..4ed398c 100644 --- a/content/renderer/active_notification_tracker.cc +++ b/content/renderer/active_notification_tracker.cc @@ -6,8 +6,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/public/web/WebNotification.h" +#include "third_party/WebKit/public/web/WebNotificationPermissionCallback.h" using WebKit::WebNotification; using WebKit::WebNotificationPermissionCallback; diff --git a/content/renderer/active_notification_tracker.h b/content/renderer/active_notification_tracker.h index 68e022d..6591eae 100644 --- a/content/renderer/active_notification_tracker.h +++ b/content/renderer/active_notification_tracker.h @@ -11,7 +11,7 @@ #include "base/containers/hash_tables.h" #include "base/id_map.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" +#include "third_party/WebKit/public/web/WebNotification.h" namespace WebKit { class WebNotificationPermissionCallback; diff --git a/content/renderer/all_rendering_benchmarks.cc b/content/renderer/all_rendering_benchmarks.cc index 935d377..2c01a65 100644 --- a/content/renderer/all_rendering_benchmarks.cc +++ b/content/renderer/all_rendering_benchmarks.cc @@ -19,7 +19,7 @@ #include "third_party/skia/include/utils/SkNullCanvas.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebViewBenchmarkSupport.h" +#include "third_party/WebKit/public/web/WebViewBenchmarkSupport.h" using base::TimeDelta; using base::TimeTicks; diff --git a/content/renderer/android/content_detector.cc b/content/renderer/android/content_detector.cc index c40cb1b..95caba5 100644 --- a/content/renderer/android/content_detector.cc +++ b/content/renderer/android/content_detector.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "third_party/WebKit/public/platform/WebPoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSurroundingText.h" +#include "third_party/WebKit/public/web/WebHitTestResult.h" +#include "third_party/WebKit/public/web/WebSurroundingText.h" using WebKit::WebRange; using WebKit::WebSurroundingText; diff --git a/content/renderer/android/content_detector.h b/content/renderer/android/content_detector.h index 6695cf8..8a06ee7 100644 --- a/content/renderer/android/content_detector.h +++ b/content/renderer/android/content_detector.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_ANDROID_CONTENT_DETECTOR_H_ #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h" +#include "third_party/WebKit/public/web/WebRange.h" namespace WebKit { class WebHitTestResult; diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index 7171e7f..4b6ddf58 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/test/image_decoder_test.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h" +#include "third_party/WebKit/public/web/WebImageDecoder.h" class BMPImageDecoderTest : public ImageDecoderTest { public: diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 903c01e..5de4769 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -23,16 +23,16 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/v8_value_converter_impl.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMCustomEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebDOMCustomEvent.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPluginParams.h" +#include "third_party/WebKit/public/web/WebScriptSource.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "ui/base/keycodes/keyboard_codes.h" #include "webkit/plugins/sad_plugin.h" diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index 99b4e36..3499d47 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_H_ -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" +#include "third_party/WebKit/public/web/WebPlugin.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" @@ -20,7 +20,7 @@ #include "content/renderer/browser_plugin/browser_plugin_bindings.h" #include "content/renderer/mouse_lock_dispatcher.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragStatus.h" +#include "third_party/WebKit/public/web/WebDragStatus.h" struct BrowserPluginHostMsg_AutoSize_Params; struct BrowserPluginHostMsg_ResizeGuest_Params; diff --git a/content/renderer/browser_plugin/browser_plugin_bindings.cc b/content/renderer/browser_plugin/browser_plugin_bindings.cc index 2cf4c54..6699057 100644 --- a/content/renderer/browser_plugin/browser_plugin_bindings.cc +++ b/content/renderer/browser_plugin/browser_plugin_bindings.cc @@ -16,13 +16,13 @@ #include "content/common/browser_plugin/browser_plugin_constants.h" #include "content/renderer/browser_plugin/browser_plugin.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebDOMMessageEvent.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "third_party/npapi/bindings/npapi.h" #include "v8/include/v8.h" diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc index c7342a8..4cb2175 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc @@ -15,9 +15,9 @@ #include "content/renderer/render_thread_impl.h" #include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebScriptSource.h" namespace { const char kHTMLForBrowserPluginObject[] = diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.h b/content/renderer/browser_plugin/browser_plugin_browsertest.h index 43ad0f8..2867690 100644 --- a/content/renderer/browser_plugin/browser_plugin_browsertest.h +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.h @@ -15,7 +15,7 @@ #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" class RenderThreadImpl; diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc index 0ae39cc..c5d8b1f 100644 --- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc +++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc @@ -13,7 +13,7 @@ #include "content/renderer/browser_plugin/browser_plugin_manager.h" #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/size_conversions.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc index 36c46f9..d4aa912 100644 --- a/content/renderer/context_menu_params_builder.cc +++ b/content/renderer/context_menu_params_builder.cc @@ -8,8 +8,8 @@ #include "content/common/ssl_status_serialization.h" #include "content/public/common/context_menu_params.h" #include "content/public/renderer/history_item_serialization.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebNode.h" namespace content { diff --git a/content/renderer/cpp_bound_class_unittest.cc b/content/renderer/cpp_bound_class_unittest.cc index a1df052..12fb40c 100644 --- a/content/renderer/cpp_bound_class_unittest.cc +++ b/content/renderer/cpp_bound_class_unittest.cc @@ -10,8 +10,8 @@ #include "content/public/renderer/render_view_observer.h" #include "content/public/test/render_view_test.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" #include "webkit/renderer/cpp_binding_example.h" using webkit_glue::CppArgumentList; diff --git a/content/renderer/date_time_formatter.cc b/content/renderer/date_time_formatter.cc index f685cf3..6c58603 100644 --- a/content/renderer/date_time_formatter.cc +++ b/content/renderer/date_time_formatter.cc @@ -7,7 +7,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "third_party/WebKit/public/platform/WebCString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" #include "third_party/icu/public/i18n/unicode/smpdtfmt.h" diff --git a/content/renderer/date_time_formatter_unittest.cc b/content/renderer/date_time_formatter_unittest.cc index 52bce89..b75b7c5 100644 --- a/content/renderer/date_time_formatter_unittest.cc +++ b/content/renderer/date_time_formatter_unittest.cc @@ -7,7 +7,7 @@ #include "content/renderer/date_time_formatter.h" #include "content/renderer/renderer_date_time_picker.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" #include "third_party/icu/public/common/unicode/unistr.h" #include "ui/base/ime/text_input_type.h" diff --git a/content/renderer/device_orientation_dispatcher.cc b/content/renderer/device_orientation_dispatcher.cc index 6249476..68923b3 100644 --- a/content/renderer/device_orientation_dispatcher.cc +++ b/content/renderer/device_orientation_dispatcher.cc @@ -6,8 +6,8 @@ #include "content/common/device_orientation_messages.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientation.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationController.h" +#include "third_party/WebKit/public/web/WebDeviceOrientation.h" +#include "third_party/WebKit/public/web/WebDeviceOrientationController.h" namespace content { diff --git a/content/renderer/device_orientation_dispatcher.h b/content/renderer/device_orientation_dispatcher.h index 39bc5f1..5ee3342 100644 --- a/content/renderer/device_orientation_dispatcher.h +++ b/content/renderer/device_orientation_dispatcher.h @@ -5,8 +5,8 @@ #ifndef CONTENT_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_ #define CONTENT_RENDERER_DEVICE_ORIENTATION_DISPATCHER_H_ -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientationClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientation.h" +#include "third_party/WebKit/public/web/WebDeviceOrientationClient.h" +#include "third_party/WebKit/public/web/WebDeviceOrientation.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc index 6531bc8..7e35954 100644 --- a/content/renderer/devtools/devtools_agent.cc +++ b/content/renderer/devtools/devtools_agent.cc @@ -18,11 +18,11 @@ #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebPoint.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebDevToolsAgent.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" #if defined(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" diff --git a/content/renderer/devtools/devtools_agent.h b/content/renderer/devtools/devtools_agent.h index 7926f44..4ac22db 100644 --- a/content/renderer/devtools/devtools_agent.h +++ b/content/renderer/devtools/devtools_agent.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "content/public/common/console_message_level.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h" +#include "third_party/WebKit/public/web/WebDevToolsAgentClient.h" namespace WebKit { class WebDevToolsAgent; diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc index 41860c9..703de2f 100644 --- a/content/renderer/devtools/devtools_agent_filter.cc +++ b/content/renderer/devtools/devtools_agent_filter.cc @@ -10,7 +10,7 @@ #include "content/renderer/devtools/devtools_agent.h" #include "content/renderer/plugin_channel_host.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/public/web/WebDevToolsAgent.h" using WebKit::WebDevToolsAgent; using WebKit::WebString; diff --git a/content/renderer/devtools/devtools_client.cc b/content/renderer/devtools/devtools_client.cc index d0a55b2..1df7008 100644 --- a/content/renderer/devtools/devtools_client.cc +++ b/content/renderer/devtools/devtools_client.cc @@ -12,7 +12,7 @@ #include "content/public/common/url_constants.h" #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/public/web/WebDevToolsFrontend.h" #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebString.h" #include "ui/base/ui_base_switches.h" diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools/devtools_client.h index 3a24804..fedabd0 100644 --- a/content/renderer/devtools/devtools_client.h +++ b/content/renderer/devtools/devtools_client.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h" +#include "third_party/WebKit/public/web/WebDevToolsFrontendClient.h" namespace WebKit { class WebDevToolsFrontend; diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index 568e1c9..881e06e 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -20,15 +20,15 @@ #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeCollection.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebNodeCollection.h" +#include "third_party/WebKit/public/web/WebNodeList.h" +#include "third_party/WebKit/public/web/WebPageSerializer.h" +#include "third_party/WebKit/public/web/WebPageSerializerClient.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/content/renderer/dom_storage/dom_storage_dispatcher.cc b/content/renderer/dom_storage/dom_storage_dispatcher.cc index 4ac31a1..e36084c 100644 --- a/content/renderer/dom_storage/dom_storage_dispatcher.cc +++ b/content/renderer/dom_storage/dom_storage_dispatcher.cc @@ -14,8 +14,8 @@ #include "content/renderer/dom_storage/webstoragenamespace_impl.h" #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/public/platform/Platform.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" #include "webkit/common/dom_storage/dom_storage_types.h" #include "webkit/renderer/dom_storage/dom_storage_cached_area.h" #include "webkit/renderer/dom_storage/dom_storage_proxy.h" diff --git a/content/renderer/external_popup_menu.cc b/content/renderer/external_popup_menu.cc index bc24463..06f8345 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/public/platform/WebRect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalPopupMenuClient.h" +#include "third_party/WebKit/public/web/WebExternalPopupMenuClient.h" namespace content { diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h index d701ddc..729205f 100644 --- a/content/renderer/external_popup_menu.h +++ b/content/renderer/external_popup_menu.h @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalPopupMenu.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h" +#include "third_party/WebKit/public/web/WebExternalPopupMenu.h" +#include "third_party/WebKit/public/web/WebPopupMenuInfo.h" namespace WebKit { class WebExternalPopupMenuClient; diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index bce4d63..30e5397 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -7,7 +7,7 @@ #include "content/public/test/render_view_test.h" #include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebSize.h" // Tests for the external select popup menu (Mac specific). diff --git a/content/renderer/fetchers/image_resource_fetcher.cc b/content/renderer/fetchers/image_resource_fetcher.cc index 8185e61..7848500 100644 --- a/content/renderer/fetchers/image_resource_fetcher.cc +++ b/content/renderer/fetchers/image_resource_fetcher.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/debug/crash_logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" #include "webkit/glue/image_decoder.h" diff --git a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc index f3c79b3..333acef 100644 --- a/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc +++ b/content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" #include "webkit/glue/image_decoder.h" diff --git a/content/renderer/fetchers/resource_fetcher.cc b/content/renderer/fetchers/resource_fetcher.cc index feb8aaa9..455f59e 100644 --- a/content/renderer/fetchers/resource_fetcher.cc +++ b/content/renderer/fetchers/resource_fetcher.cc @@ -10,9 +10,9 @@ #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLLoader.h" #include "third_party/WebKit/public/platform/WebURLRequest.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/WebKit.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebKit.h" using base::TimeDelta; using WebKit::WebFrame; diff --git a/content/renderer/geolocation_dispatcher.cc b/content/renderer/geolocation_dispatcher.cc index 7d4aa4e..57eeeb6 100644 --- a/content/renderer/geolocation_dispatcher.cc +++ b/content/renderer/geolocation_dispatcher.cc @@ -7,11 +7,11 @@ #include "content/common/geolocation_messages.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationPermissionRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationPermissionRequestManager.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationPosition.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationError.h" +#include "third_party/WebKit/public/web/WebGeolocationPermissionRequest.h" +#include "third_party/WebKit/public/web/WebGeolocationPermissionRequestManager.h" +#include "third_party/WebKit/public/web/WebGeolocationClient.h" +#include "third_party/WebKit/public/web/WebGeolocationPosition.h" +#include "third_party/WebKit/public/web/WebGeolocationError.h" using WebKit::WebGeolocationController; using WebKit::WebGeolocationError; diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h index 7ce2b6a..bda1ff7 100644 --- a/content/renderer/geolocation_dispatcher.h +++ b/content/renderer/geolocation_dispatcher.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_ptr.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebGeolocationController.h" +#include "third_party/WebKit/public/web/WebGeolocationClient.h" +#include "third_party/WebKit/public/web/WebGeolocationController.h" namespace WebKit { class WebGeolocationController; diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 094d9b9..9066d55 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -19,10 +19,10 @@ #include "content/renderer/render_view_impl.h" #include "content/renderer/rendering_benchmark.h" #include "content/renderer/skia_benchmarking_extension.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageCache.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebViewBenchmarkSupport.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebImageCache.h" +#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/WebKit/public/web/WebViewBenchmarkSupport.h" #include "third_party/skia/include/core/SkData.h" #include "third_party/skia/include/core/SkGraphics.h" #include "third_party/skia/include/core/SkPicture.h" diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h index 275cc00..1f44e09 100644 --- a/content/renderer/gpu/input_event_filter.h +++ b/content/renderer/gpu/input_event_filter.h @@ -14,7 +14,7 @@ #include "content/port/common/input_event_ack_state.h" #include "content/renderer/gpu/input_handler_manager_client.h" #include "ipc/ipc_channel_proxy.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" // This class can be used to intercept InputMsg_HandleInputEvent messages // and have them be delivered to a target thread. Input events are filtered diff --git a/content/renderer/gpu/input_handler_proxy.cc b/content/renderer/gpu/input_handler_proxy.cc index 6fa233a..4d0e58b 100644 --- a/content/renderer/gpu/input_handler_proxy.cc +++ b/content/renderer/gpu/input_handler_proxy.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "content/renderer/gpu/input_handler_proxy_client.h" #include "third_party/WebKit/public/platform/Platform.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/latency_info.h" using WebKit::WebFloatPoint; diff --git a/content/renderer/gpu/input_handler_proxy.h b/content/renderer/gpu/input_handler_proxy.h index 5331bf9..5a73cf5 100644 --- a/content/renderer/gpu/input_handler_proxy.h +++ b/content/renderer/gpu/input_handler_proxy.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "cc/input/input_handler.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebActiveWheelFlingParameters.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/platform/WebGestureCurve.h" #include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" diff --git a/content/renderer/gpu/input_handler_proxy_unittest.cc b/content/renderer/gpu/input_handler_proxy_unittest.cc index edc2d6e..9485949 100644 --- a/content/renderer/gpu/input_handler_proxy_unittest.cc +++ b/content/renderer/gpu/input_handler_proxy_unittest.cc @@ -13,7 +13,7 @@ #include "third_party/WebKit/public/platform/WebFloatSize.h" #include "third_party/WebKit/public/platform/WebGestureCurve.h" #include "third_party/WebKit/public/platform/WebPoint.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" #include "ui/base/latency_info.h" using WebKit::WebActiveWheelFlingParameters; diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index 69e3778..9bc320c 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -22,7 +22,7 @@ #include "content/renderer/gpu/input_handler_manager.h" #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebWidget.h" #include "ui/gl/gl_switches.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" diff --git a/content/renderer/ico_image_decoder_unittest.cc b/content/renderer/ico_image_decoder_unittest.cc index 7e1e01e5..83f5a3f 100644 --- a/content/renderer/ico_image_decoder_unittest.cc +++ b/content/renderer/ico_image_decoder_unittest.cc @@ -4,7 +4,7 @@ #include "base/files/file_path.h" #include "content/test/image_decoder_test.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h" +#include "third_party/WebKit/public/web/WebImageDecoder.h" using WebKit::WebImageDecoder; diff --git a/content/renderer/image_loading_helper.cc b/content/renderer/image_loading_helper.cc index 718223c..cc653b4 100644 --- a/content/renderer/image_loading_helper.cc +++ b/content/renderer/image_loading_helper.cc @@ -13,8 +13,8 @@ #include "net/base/data_url.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" diff --git a/content/renderer/input_tag_speech_dispatcher.cc b/content/renderer/input_tag_speech_dispatcher.cc index 2a05b20..afce8c2 100644 --- a/content/renderer/input_tag_speech_dispatcher.cc +++ b/content/renderer/input_tag_speech_dispatcher.cc @@ -9,14 +9,14 @@ #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#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/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputListener.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebSpeechInputListener.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebDocument; using WebKit::WebElement; diff --git a/content/renderer/input_tag_speech_dispatcher.h b/content/renderer/input_tag_speech_dispatcher.h index caefd26..b51d723 100644 --- a/content/renderer/input_tag_speech_dispatcher.h +++ b/content/renderer/input_tag_speech_dispatcher.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "content/public/common/speech_recognition_result.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputController.h" +#include "third_party/WebKit/public/web/WebSpeechInputController.h" namespace WebKit { class WebSpeechInputListener; diff --git a/content/renderer/internal_document_state_data.cc b/content/renderer/internal_document_state_data.cc index b63410a..132093b 100644 --- a/content/renderer/internal_document_state_data.cc +++ b/content/renderer/internal_document_state_data.cc @@ -7,7 +7,7 @@ #include "content/public/common/password_form.h" #include "content/public/renderer/document_state.h" #include "content/renderer/fetchers/alt_error_page_resource_fetcher.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/public/web/WebDataSource.h" namespace content { diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc index a9657ab..1eeac19 100644 --- a/content/renderer/java/java_bridge_dispatcher.cc +++ b/content/renderer/java/java_bridge_dispatcher.cc @@ -10,10 +10,10 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/renderer/java/java_bridge_channel.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.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/WebView.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" namespace content { diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc index 49de757..753f848 100644 --- a/content/renderer/media/media_stream_center.cc +++ b/content/renderer/media/media_stream_center.cc @@ -20,7 +20,7 @@ #include "third_party/WebKit/public/platform/WebMediaStreamSourcesRequest.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/libjingle/source/talk/app/webrtc/jsep.h" namespace content { diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc index 80cd8a4..eeb8139 100644 --- a/content/renderer/media/media_stream_dependency_factory.cc +++ b/content/renderer/media/media_stream_dependency_factory.cc @@ -30,8 +30,8 @@ #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebURL.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/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" #if defined(USE_OPENSSL) #include "third_party/libjingle/source/talk/base/ssladapter.h" diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index 2e9f0a9..cfa4c49 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -23,9 +23,9 @@ #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebVector.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/WebMediaStreamRegistry.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" #include "webkit/renderer/media/media_stream_audio_renderer.h" namespace content { diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h index b9c1235..49a61f5b 100644 --- a/content/renderer/media/media_stream_impl.h +++ b/content/renderer/media/media_stream_impl.h @@ -19,8 +19,8 @@ #include "content/public/renderer/render_view_observer.h" #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" #include "third_party/WebKit/public/platform/WebMediaStream.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h" +#include "third_party/WebKit/public/web/WebUserMediaClient.h" +#include "third_party/WebKit/public/web/WebUserMediaRequest.h" #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" #include "webkit/renderer/media/media_stream_client.h" diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc index 69a2043..9f52e65 100644 --- a/content/renderer/media/peer_connection_tracker.cc +++ b/content/renderer/media/peer_connection_tracker.cc @@ -13,8 +13,8 @@ #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" #include "third_party/WebKit/public/platform/WebRTCICECandidate.h" #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.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/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" using std::string; using webrtc::MediaConstraintsInterface; diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc index cb2ba7d..3d23a9c 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.cc +++ b/content/renderer/media/renderer_webaudiodevice_impl.cc @@ -10,8 +10,8 @@ #include "content/renderer/render_view_impl.h" #include "media/audio/audio_output_device.h" #include "media/base/media_switches.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebAudioDevice; using WebKit::WebFrame; diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc index 3fb4160..59413582 100644 --- a/content/renderer/media/rtc_peer_connection_handler.cc +++ b/content/renderer/media/rtc_peer_connection_handler.cc @@ -34,7 +34,7 @@ #include "third_party/WebKit/public/platform/WebRTCStatsRequest.h" #include "third_party/WebKit/public/platform/WebRTCVoidRequest.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrame.h" namespace content { diff --git a/content/renderer/media/video_destination_handler.cc b/content/renderer/media/video_destination_handler.cc index 1554f71..6745acc 100644 --- a/content/renderer/media/video_destination_handler.cc +++ b/content/renderer/media/video_destination_handler.cc @@ -13,7 +13,7 @@ #include "content/renderer/media/media_stream_registry_interface.h" #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h" +#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" #include "webkit/plugins/ppapi/ppb_image_data_impl.h" using cricket::CaptureState; diff --git a/content/renderer/media/video_source_handler.cc b/content/renderer/media/video_source_handler.cc index 8748dee..c0577fc 100644 --- a/content/renderer/media/video_source_handler.cc +++ b/content/renderer/media/video_source_handler.cc @@ -11,7 +11,7 @@ #include "content/renderer/media/media_stream_registry_interface.h" #include "content/renderer/render_thread_impl.h" #include "third_party/WebKit/public/platform/WebMediaStream.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h" +#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" #include "third_party/libjingle/source/talk/media/base/videoframe.h" #include "third_party/libjingle/source/talk/media/base/videorenderer.h" diff --git a/content/renderer/mhtml_generator.cc b/content/renderer/mhtml_generator.cc index 6edc0fc..0a1c785 100644 --- a/content/renderer/mhtml_generator.cc +++ b/content/renderer/mhtml_generator.cc @@ -8,7 +8,7 @@ #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebCString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" +#include "third_party/WebKit/public/web/WebPageSerializer.h" namespace content { diff --git a/content/renderer/mouse_lock_dispatcher.cc b/content/renderer/mouse_lock_dispatcher.cc index 60a4729..56ec66d 100644 --- a/content/renderer/mouse_lock_dispatcher.cc +++ b/content/renderer/mouse_lock_dispatcher.cc @@ -5,7 +5,7 @@ #include "content/renderer/mouse_lock_dispatcher.h" #include "base/logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" namespace content { diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc index 968afc8..fc75042 100644 --- a/content/renderer/notification_provider.cc +++ b/content/renderer/notification_provider.cc @@ -9,11 +9,11 @@ #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebURL.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/WebNotificationPermissionCallback.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserGestureIndicator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebDocument; using WebKit::WebNotification; diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h index c7595e8..ababece 100644 --- a/content/renderer/notification_provider.h +++ b/content/renderer/notification_provider.h @@ -7,8 +7,8 @@ #include "content/public/renderer/render_view_observer.h" #include "content/renderer/active_notification_tracker.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/public/web/WebNotification.h" +#include "third_party/WebKit/public/web/WebNotificationPresenter.h" namespace WebKit { class WebNotificationPermissionCallback; diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc index edab294..1f921e4 100644 --- a/content/renderer/p2p/port_allocator.cc +++ b/content/renderer/p2p/port_allocator.cc @@ -18,8 +18,8 @@ #include "third_party/WebKit/public/platform/WebURLLoader.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebURLLoaderOptions.h" using WebKit::WebString; using WebKit::WebURL; diff --git a/content/renderer/password_form_conversion_utils.cc b/content/renderer/password_form_conversion_utils.cc index 793bb60..ad41eb5 100644 --- a/content/renderer/password_form_conversion_utils.cc +++ b/content/renderer/password_form_conversion_utils.cc @@ -5,7 +5,7 @@ #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/common/password_form.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPasswordFormData.h" +#include "third_party/WebKit/public/web/WebPasswordFormData.h" using WebKit::WebFormElement; using WebKit::WebPasswordFormData; diff --git a/content/renderer/password_form_conversion_utils_browsertest.cc b/content/renderer/password_form_conversion_utils_browsertest.cc index 38892c7..8cea872 100644 --- a/content/renderer/password_form_conversion_utils_browsertest.cc +++ b/content/renderer/password_form_conversion_utils_browsertest.cc @@ -9,9 +9,9 @@ #include "content/public/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPasswordFormData.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFormElement.h" +#include "third_party/WebKit/public/web/WebPasswordFormData.h" using WebKit::WebFormElement; using WebKit::WebFrame; diff --git a/content/renderer/pepper/pepper_audio_input_host.cc b/content/renderer/pepper/pepper_audio_input_host.cc index 63aef62..1c0496e 100644 --- a/content/renderer/pepper/pepper_audio_input_host.cc +++ b/content/renderer/pepper/pepper_audio_input_host.cc @@ -14,9 +14,9 @@ #include "ppapi/host/ppapi_host.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" namespace content { diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index 8f11415..6f9b453 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc @@ -16,8 +16,8 @@ #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" +#include "third_party/WebKit/public/web/WebFileChooserCompletion.h" +#include "third_party/WebKit/public/web/WebFileChooserParams.h" #include "webkit/plugins/ppapi/ppb_file_ref_impl.h" namespace content { diff --git a/content/renderer/pepper/pepper_file_io_host.cc b/content/renderer/pepper/pepper_file_io_host.cc index b0dc548..2011155 100644 --- a/content/renderer/pepper/pepper_file_io_host.cc +++ b/content/renderer/pepper/pepper_file_io_host.cc @@ -18,7 +18,7 @@ #include "ppapi/shared_impl/file_type_conversion.h" #include "ppapi/shared_impl/time_conversion.h" #include "ppapi/thunk/enter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/ppb_file_ref_impl.h" diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc index 1249680..e4c9d93 100644 --- a/content/renderer/pepper/pepper_file_system_host.cc +++ b/content/renderer/pepper/pepper_file_system_host.cc @@ -15,11 +15,11 @@ #include "ppapi/host/ppapi_host.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/file_type_conversion.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/common/fileapi/file_system_util.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index bcc408e..a22d624 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -83,14 +83,14 @@ #include "ppapi/shared_impl/resource_tracker.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_tcp_server_socket_private_api.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/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/size.h" #include "webkit/plugins/npapi/webplugin.h" #include "webkit/plugins/ppapi/plugin_module.h" diff --git a/content/renderer/pepper/pepper_url_loader_host.cc b/content/renderer/pepper/pepper_url_loader_host.cc index 870545e..9636a58 100644 --- a/content/renderer/pepper/pepper_url_loader_host.cc +++ b/content/renderer/pepper/pepper_url_loader_host.cc @@ -16,13 +16,13 @@ #include "third_party/WebKit/public/platform/WebURLLoader.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebURLLoaderOptions.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/url_request_info_util.h" #include "webkit/plugins/ppapi/url_response_info_util.h" diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc index c60ae47..a242cee 100644 --- a/content/renderer/pepper/pepper_url_request_unittest.cc +++ b/content/renderer/pepper/pepper_url_request_unittest.cc @@ -11,9 +11,9 @@ #include "ppapi/thunk/thunk.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebFrameClient.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/user_agent/user_agent_util.h" #include "webkit/plugins/ppapi/url_request_info_util.h" diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc index 0ab21b9..b49721a 100644 --- a/content/renderer/pepper/pepper_video_capture_host.cc +++ b/content/renderer/pepper/pepper_video_capture_host.cc @@ -11,9 +11,9 @@ #include "ppapi/shared_impl/host_resource.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_buffer_api.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" diff --git a/content/renderer/pepper/pepper_websocket_host.cc b/content/renderer/pepper/pepper_websocket_host.cc index 950b49b..563f7fa 100644 --- a/content/renderer/pepper/pepper_websocket_host.cc +++ b/content/renderer/pepper/pepper_websocket_host.cc @@ -16,11 +16,11 @@ #include "ppapi/proxy/ppapi_messages.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBuffer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocket.h" +#include "third_party/WebKit/public/web/WebArrayBuffer.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebSocket.h" using WebKit::WebArrayBuffer; using WebKit::WebDocument; diff --git a/content/renderer/pepper/pepper_websocket_host.h b/content/renderer/pepper/pepper_websocket_host.h index 8c6c8c9..7c8d5b2 100644 --- a/content/renderer/pepper/pepper_websocket_host.h +++ b/content/renderer/pepper/pepper_websocket_host.h @@ -13,8 +13,8 @@ #include "ppapi/host/host_message_context.h" #include "ppapi/host/resource_host.h" #include "ppapi/proxy/resource_message_params.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocket.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSocketClient.h" +#include "third_party/WebKit/public/web/WebSocket.h" +#include "third_party/WebKit/public/web/WebSocketClient.h" namespace ppapi { class StringVar; diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc index aaa6242..587dc1f 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc @@ -19,9 +19,9 @@ #include "ppapi/host/ppapi_host.h" #include "ppapi/proxy/host_dispatcher.h" #include "third_party/WebKit/public/platform/WebRect.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" #include "ui/gfx/point.h" #include "webkit/plugins/ppapi/fullscreen_container.h" #include "webkit/plugins/ppapi/host_globals.h" diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc index 53cfea1..1cb4943 100644 --- a/content/renderer/plugin_channel_host.cc +++ b/content/renderer/plugin_channel_host.cc @@ -14,7 +14,7 @@ #include "ipc/ipc_channel_posix.h" #endif -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/public/web/WebBindings.h" // TODO(shess): Debugging for http://crbug.com/97285 // diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 67cd0eb..6d0f883 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -82,18 +82,18 @@ #include "media/base/media.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.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/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" -#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/WebSecurityPolicy.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebColorName.h" +#include "third_party/WebKit/public/web/WebDatabase.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebNetworkStateNotifier.h" +#include "third_party/WebKit/public/web/WebPopupMenu.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebScriptController.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebSharedWorkerRepository.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebString.h" #include "ui/base/layout.h" #include "ui/base/ui_base_switches.h" diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 43f8715..08e26da 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -22,9 +22,9 @@ #include "content/test/mock_keyboard.h" #include "net/base/net_errors.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/WebKit/public/web/WebWindowFeatures.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebHTTPBody.h" #include "third_party/WebKit/public/platform/WebString.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 39d368c..caa5407 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -132,48 +132,48 @@ #include "net/base/net_errors.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.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" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" -#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/WebHelperPlugin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.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/WebMediaPlayerAction.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginAction.h" -#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/WebRange.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/WebSerializedScriptValue.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserGestureIndicator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h" +#include "third_party/WebKit/public/web/WebAccessibilityObject.h" +#include "third_party/WebKit/public/web/WebColorName.h" +#include "third_party/WebKit/public/web/WebDOMEvent.h" +#include "third_party/WebKit/public/web/WebDOMMessageEvent.h" +#include "third_party/WebKit/public/web/WebDataSource.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" +#include "third_party/WebKit/public/web/WebDevToolsAgent.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFileChooserParams.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" +#include "third_party/WebKit/public/web/WebFindOptions.h" +#include "third_party/WebKit/public/web/WebFormControlElement.h" +#include "third_party/WebKit/public/web/WebFormElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebHelperPlugin.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebMediaPlayerAction.h" +#include "third_party/WebKit/public/web/WebNavigationPolicy.h" +#include "third_party/WebKit/public/web/WebNodeList.h" +#include "third_party/WebKit/public/web/WebPageSerializer.h" +#include "third_party/WebKit/public/web/WebPlugin.h" +#include "third_party/WebKit/public/web/WebPluginAction.h" +#include "third_party/WebKit/public/web/WebPluginContainer.h" +#include "third_party/WebKit/public/web/WebPluginDocument.h" +#include "third_party/WebKit/public/web/WebPluginParams.h" +#include "third_party/WebKit/public/web/WebRange.h" +#include "third_party/WebKit/public/web/WebScriptSource.h" +#include "third_party/WebKit/public/web/WebSearchableFormData.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebSerializedScriptValue.h" +#include "third_party/WebKit/public/web/WebSettings.h" +#include "third_party/WebKit/public/web/WebStorageQuotaCallbacks.h" +#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" +#include "third_party/WebKit/public/web/WebUserMediaClient.h" +#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/WebKit/public/web/WebWindowFeatures.h" +#include "third_party/WebKit/public/web/default/WebRenderTheme.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebFileSystemType.h" @@ -227,7 +227,7 @@ #include "content/renderer/android/phone_number_detector.h" #include "content/renderer/media/stream_texture_factory_impl_android.h" #include "content/renderer/media/webmediaplayer_proxy_impl_android.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h" +#include "third_party/WebKit/public/web/WebHitTestResult.h" #include "third_party/WebKit/public/platform/WebFloatPoint.h" #include "third_party/WebKit/public/platform/WebFloatRect.h" #include "ui/gfx/rect_f.h" diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 08402a6..0d2c5ab 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -43,18 +43,18 @@ #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" +#include "third_party/WebKit/public/web/WebConsoleMessage.h" +#include "third_party/WebKit/public/web/WebDataSource.h" +#include "third_party/WebKit/public/web/WebFrameClient.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebIconURL.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebNavigationType.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebPageSerializerClient.h" +#include "third_party/WebKit/public/web/WebPageVisibilityState.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebViewClient.h" #include "ui/surface/transport_dib.h" #include "webkit/common/webpreferences.h" #include "webkit/plugins/npapi/webplugin_page_delegate.h" @@ -62,7 +62,7 @@ #if defined(OS_ANDROID) #include "content/renderer/android/content_detector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebContentDetectionResult.h" +#include "third_party/WebKit/public/web/WebContentDetectionResult.h" #endif #if defined(COMPILER_MSVC) diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc index 43d8b43..01218ad 100644 --- a/content/renderer/render_view_linux.cc +++ b/content/renderer/render_view_linux.cc @@ -5,7 +5,7 @@ #include "content/renderer/render_view_impl.h" #include "content/public/common/renderer_preferences.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRendering.h" +#include "third_party/WebKit/public/web/linux/WebFontRendering.h" using WebKit::WebFontRendering; diff --git a/content/renderer/render_view_mouse_lock_dispatcher.cc b/content/renderer/render_view_mouse_lock_dispatcher.cc index 40a5c70..41d21b7 100644 --- a/content/renderer/render_view_mouse_lock_dispatcher.cc +++ b/content/renderer/render_view_mouse_lock_dispatcher.cc @@ -6,10 +6,10 @@ #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebUserGestureIndicator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" +#include "third_party/WebKit/public/web/WebView.h" +#include "third_party/WebKit/public/web/WebWidget.h" using WebKit::WebUserGestureIndicator; diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index fd84bb6..a423f1e 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -34,13 +34,13 @@ #include "content/renderer/renderer_webkitplatformsupport_impl.h" #include "ipc/ipc_sync_message.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.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/WebScreenInfo.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebHelperPlugin.h" +#include "third_party/WebKit/public/web/WebPagePopup.h" +#include "third_party/WebKit/public/web/WebPopupMenu.h" +#include "third_party/WebKit/public/web/WebPopupMenuInfo.h" +#include "third_party/WebKit/public/web/WebRange.h" +#include "third_party/WebKit/public/web/WebScreenInfo.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebPoint.h" #include "third_party/WebKit/public/platform/WebRect.h" @@ -70,7 +70,7 @@ #include "third_party/skia/include/core/SkPixelRef.h" #endif // defined(OS_POSIX) -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebWidget.h" using WebKit::WebCompositionUnderline; using WebKit::WebCursorInfo; diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 467d290..2871cd6 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -23,11 +23,11 @@ #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "third_party/WebKit/public/platform/WebRect.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/WebTextDirection.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidgetClient.h" +#include "third_party/WebKit/public/web/WebCompositionUnderline.h" +#include "third_party/WebKit/public/web/WebPopupType.h" +#include "third_party/WebKit/public/web/WebTextDirection.h" +#include "third_party/WebKit/public/web/WebTextInputInfo.h" +#include "third_party/WebKit/public/web/WebWidgetClient.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/range/range.h" diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc index c45e2a8..79fc8c3 100644 --- a/content/renderer/render_widget_fullscreen.cc +++ b/content/renderer/render_widget_fullscreen.cc @@ -5,7 +5,7 @@ #include "content/renderer/render_widget_fullscreen.h" #include "content/common/view_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebWidget.h" using WebKit::WebWidget; diff --git a/content/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h index dfd1582..9978fd2 100644 --- a/content/renderer/render_widget_fullscreen.h +++ b/content/renderer/render_widget_fullscreen.h @@ -7,7 +7,7 @@ #include "content/renderer/render_widget.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebWidget.h" namespace content { diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 10b7006..104d8e7 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -21,8 +21,8 @@ #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebLayer.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebCursorInfo.h" +#include "third_party/WebKit/public/web/WebWidget.h" #include "ui/gfx/size_conversions.h" #include "ui/gl/gpu_preference.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h index 4f95fd6..66df3c7 100644 --- a/content/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "content/renderer/mouse_lock_dispatcher.h" #include "content/renderer/render_widget_fullscreen.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" +#include "third_party/WebKit/public/web/WebWidget.h" #include "webkit/plugins/ppapi/fullscreen_container.h" namespace webkit { diff --git a/content/renderer/renderer_date_time_picker.cc b/content/renderer/renderer_date_time_picker.cc index 61ecd5c..7d987b4 100644 --- a/content/renderer/renderer_date_time_picker.cc +++ b/content/renderer/renderer_date_time_picker.cc @@ -9,9 +9,9 @@ #include "content/renderer/date_time_formatter.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeInputType.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" +#include "third_party/WebKit/public/web/WebDateTimeInputType.h" using WebKit::WebString; diff --git a/content/renderer/renderer_date_time_picker.h b/content/renderer/renderer_date_time_picker.h index 23dcf68..d7292b7 100644 --- a/content/renderer/renderer_date_time_picker.h +++ b/content/renderer/renderer_date_time_picker.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h" +#include "third_party/WebKit/public/web/WebDateTimeChooserParams.h" struct ViewHostMsg_DateTimeDialogValue_Params; diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 17856c5..22f5816 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -43,7 +43,7 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" #endif // OS_MACOSX namespace content { diff --git a/content/renderer/renderer_webapplicationcachehost_impl.cc b/content/renderer/renderer_webapplicationcachehost_impl.cc index 16717dc..42b281c 100644 --- a/content/renderer/renderer_webapplicationcachehost_impl.cc +++ b/content/renderer/renderer_webapplicationcachehost_impl.cc @@ -7,8 +7,8 @@ #include "content/common/view_messages.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" using appcache::AppCacheBackend; using WebKit::WebApplicationCacheHostClient; diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h index c45ec0d..bd8f235 100644 --- a/content/renderer/renderer_webcolorchooser_impl.h +++ b/content/renderer/renderer_webcolorchooser_impl.h @@ -7,8 +7,8 @@ #include "base/compiler_specific.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorChooser.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebColorChooserClient.h" +#include "third_party/WebKit/public/web/WebColorChooser.h" +#include "third_party/WebKit/public/web/WebColorChooserClient.h" #include "third_party/skia/include/core/SkColor.h" namespace WebKit { diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 9340b46..8f053cc 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -41,8 +41,8 @@ #include "media/audio/audio_output_device.h" #include "media/base/audio_hardware_config.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/platform/WebBlobRegistry.h" #include "third_party/WebKit/public/platform/WebFileInfo.h" #include "third_party/WebKit/public/platform/WebGamepads.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h index 717381c..2dfab9d 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.h +++ b/content/renderer/renderer_webkitplatformsupport_impl.h @@ -10,7 +10,7 @@ #include "base/platform_file.h" #include "content/child/webkitplatformsupport_impl.h" #include "content/common/content_export.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" +#include "third_party/WebKit/public/web/WebSharedWorkerRepository.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebIDBFactory.h" #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index 9930363..fa5eaab 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -16,8 +16,8 @@ #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebFrame; using WebKit::WebURLRequest; diff --git a/content/renderer/savable_resources.cc b/content/renderer/savable_resources.cc index 0637a84..d21da17 100644 --- a/content/renderer/savable_resources.cc +++ b/content/renderer/savable_resources.cc @@ -11,14 +11,14 @@ #include "base/strings/string_util.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#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/WebNodeCollection.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebNodeCollection.h" +#include "third_party/WebKit/public/web/WebNodeList.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebDocument; using WebKit::WebElement; diff --git a/content/renderer/skia_benchmarking_extension.cc b/content/renderer/skia_benchmarking_extension.cc index 1386489..c916c39 100644 --- a/content/renderer/skia_benchmarking_extension.cc +++ b/content/renderer/skia_benchmarking_extension.cc @@ -7,8 +7,8 @@ #include "base/values.h" #include "cc/resources/picture.h" #include "content/public/renderer/v8_value_converter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBuffer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/public/web/WebArrayBuffer.h" +#include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColorPriv.h" #include "third_party/skia/include/core/SkGraphics.h" diff --git a/content/renderer/speech_recognition_dispatcher.cc b/content/renderer/speech_recognition_dispatcher.cc index 9b3e286..cf7c2fe 100644 --- a/content/renderer/speech_recognition_dispatcher.cc +++ b/content/renderer/speech_recognition_dispatcher.cc @@ -10,10 +10,10 @@ #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechGrammar.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionResult.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognizerClient.h" +#include "third_party/WebKit/public/web/WebSpeechGrammar.h" +#include "third_party/WebKit/public/web/WebSpeechRecognitionParams.h" +#include "third_party/WebKit/public/web/WebSpeechRecognitionResult.h" +#include "third_party/WebKit/public/web/WebSpeechRecognizerClient.h" using WebKit::WebVector; using WebKit::WebString; diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h index b040962..bffb0c8 100644 --- a/content/renderer/speech_recognition_dispatcher.h +++ b/content/renderer/speech_recognition_dispatcher.h @@ -11,8 +11,8 @@ #include "content/public/common/speech_recognition_result.h" #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/public/platform/WebVector.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionHandle.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognizer.h" +#include "third_party/WebKit/public/web/WebSpeechRecognitionHandle.h" +#include "third_party/WebKit/public/web/WebSpeechRecognizer.h" namespace content { class RenderViewImpl; diff --git a/content/renderer/stats_collection_controller.cc b/content/renderer/stats_collection_controller.cc index 829b32c..b08f04f 100644 --- a/content/renderer/stats_collection_controller.cc +++ b/content/renderer/stats_collection_controller.cc @@ -12,8 +12,8 @@ #include "base/strings/string_util.h" #include "content/common/child_process_messages.h" #include "content/renderer/render_view_impl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" using webkit_glue::CppArgumentList; using webkit_glue::CppVariant; diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc index 18cb882..a9782da 100644 --- a/content/renderer/text_input_client_observer.cc +++ b/content/renderer/text_input_client_observer.cc @@ -10,9 +10,9 @@ #include "third_party/WebKit/public/platform/WebPoint.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebString.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/WebView.h" +#include "third_party/WebKit/public/web/mac/WebSubstringUtil.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/rect.h" namespace content { diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc index 6161a16..8b90c87 100644 --- a/content/renderer/v8_value_converter_impl.cc +++ b/content/renderer/v8_value_converter_impl.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBuffer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBufferView.h" +#include "third_party/WebKit/public/web/WebArrayBuffer.h" +#include "third_party/WebKit/public/web/WebArrayBufferView.h" #include "v8/include/v8.h" namespace content { diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc index 49f6c37..bd30d23 100644 --- a/content/renderer/web_ui_extension.cc +++ b/content/renderer/web_ui_extension.cc @@ -14,9 +14,9 @@ #include "content/public/renderer/v8_value_converter.h" #include "content/renderer/web_ui_extension_data.h" #include "googleurl/src/gurl.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/WebView.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" #include "v8/include/v8.h" namespace content { diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 88029f2..d484cd3 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -37,10 +37,10 @@ #include "ipc/ipc_channel_handle.h" #include "net/base/mime_util.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.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/WebView.h" +#include "third_party/WebKit/public/web/WebBindings.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/public/platform/WebDragData.h" #include "third_party/WebKit/public/platform/WebString.h" #include "ui/gfx/blit.h" diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc index ffb57a6..190a35c 100644 --- a/content/renderer/websharedworker_proxy.cc +++ b/content/renderer/websharedworker_proxy.cc @@ -9,7 +9,7 @@ #include "content/common/view_messages.h" #include "content/common/worker_messages.h" #include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerClient.h" +#include "third_party/WebKit/public/web/WebSharedWorkerClient.h" namespace content { diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index 320715c..e376b07 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/public/web/WebSharedWorker.h" namespace content { diff --git a/content/renderer/websharedworkerrepository_impl.h b/content/renderer/websharedworkerrepository_impl.h index c8fe659..ebe2a22 100644 --- a/content/renderer/websharedworkerrepository_impl.h +++ b/content/renderer/websharedworkerrepository_impl.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_ #include "base/containers/hash_tables.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h" +#include "third_party/WebKit/public/web/WebSharedWorkerRepository.h" namespace WebKit { class WebSharedWorker; diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc index a63a5e2..e1cd50e 100644 --- a/content/shell/renderer/shell_content_renderer_client.cc +++ b/content/shell/renderer/shell_content_renderer_client.cc @@ -15,8 +15,8 @@ #include "content/shell/renderer/shell_render_process_observer.h" #include "content/shell/renderer/webkit_test_runner.h" #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebPluginParams.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h" diff --git a/content/shell/renderer/shell_render_process_observer.cc b/content/shell/renderer/shell_render_process_observer.cc index 82cb633..1f3d94b 100644 --- a/content/shell/renderer/shell_render_process_observer.cc +++ b/content/shell/renderer/shell_render_process_observer.cc @@ -13,7 +13,7 @@ #include "content/shell/common/shell_switches.h" #include "content/shell/renderer/shell_content_renderer_client.h" #include "content/shell/renderer/webkit_test_runner.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h" #include "webkit/glue/webkit_glue.h" #include "webkit/support/gc_extension.h" diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc index 67c8c2c..f2e50f7 100644 --- a/content/shell/renderer/webkit_test_runner.cc +++ b/content/shell/renderer/webkit_test_runner.cc @@ -39,19 +39,19 @@ #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebArrayBufferView.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceOrientation.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.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/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebArrayBufferView.h" +#include "third_party/WebKit/public/web/WebContextMenuData.h" +#include "third_party/WebKit/public/web/WebDataSource.h" +#include "third_party/WebKit/public/web/WebDevToolsAgent.h" +#include "third_party/WebKit/public/web/WebDeviceOrientation.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebHistoryItem.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebScriptSource.h" +#include "third_party/WebKit/public/web/WebTestingSupport.h" +#include "third_party/WebKit/public/web/WebView.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTask.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h" #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h" diff --git a/content/shell/shell_web_contents_view_delegate_gtk.cc b/content/shell/shell_web_contents_view_delegate_gtk.cc index 9823c0c..2cc33e9 100644 --- a/content/shell/shell_web_contents_view_delegate_gtk.cc +++ b/content/shell/shell_web_contents_view_delegate_gtk.cc @@ -18,7 +18,7 @@ #include "content/shell/shell_content_browser_client.h" #include "content/shell/shell_devtools_frontend.h" #include "content/shell/shell_web_contents_view_delegate_creator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/public/web/WebContextMenuData.h" #include "ui/base/gtk/focus_store_gtk.h" #include "ui/base/gtk/gtk_floating_container.h" diff --git a/content/shell/shell_web_contents_view_delegate_mac.mm b/content/shell/shell_web_contents_view_delegate_mac.mm index a6b05e8..2acb9eb 100644 --- a/content/shell/shell_web_contents_view_delegate_mac.mm +++ b/content/shell/shell_web_contents_view_delegate_mac.mm @@ -20,7 +20,7 @@ #include "content/shell/shell_content_browser_client.h" #include "content/shell/shell_devtools_frontend.h" #include "content/shell/shell_web_contents_view_delegate_creator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/public/web/WebContextMenuData.h" using WebKit::WebContextMenuData; diff --git a/content/shell/shell_web_contents_view_delegate_win.cc b/content/shell/shell_web_contents_view_delegate_win.cc index 3bd4944..83d191b 100644 --- a/content/shell/shell_web_contents_view_delegate_win.cc +++ b/content/shell/shell_web_contents_view_delegate_win.cc @@ -18,7 +18,7 @@ #include "content/shell/shell_content_browser_client.h" #include "content/shell/shell_devtools_frontend.h" #include "content/shell/shell_web_contents_view_delegate_creator.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/public/web/WebContextMenuData.h" using WebKit::WebContextMenuData; diff --git a/content/test/image_decoder_test.cc b/content/test/image_decoder_test.cc index ac7c69d..efb1548 100644 --- a/content/test/image_decoder_test.cc +++ b/content/test/image_decoder_test.cc @@ -14,7 +14,7 @@ #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebImage.h" #include "third_party/WebKit/public/platform/WebSize.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebImageDecoder.h" +#include "third_party/WebKit/public/web/WebImageDecoder.h" using base::Time; diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index c9b22ea..a69c47a 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -14,7 +14,7 @@ #include "content/common/child_process_messages.h" #include "content/common/utility_messages.h" #include "content/public/utility/content_utility_client.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/public/web/WebKit.h" #include "webkit/plugins/npapi/plugin_list.h" #if defined(TOOLKIT_GTK) diff --git a/content/worker/shared_worker_devtools_agent.cc b/content/worker/shared_worker_devtools_agent.cc index e2c82f5..9de9643 100644 --- a/content/worker/shared_worker_devtools_agent.cc +++ b/content/worker/shared_worker_devtools_agent.cc @@ -8,7 +8,7 @@ #include "content/worker/worker_thread.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/public/web/WebSharedWorker.h" using WebKit::WebSharedWorker; using WebKit::WebString; diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 03f5ef6..8d324b2 100644 --- a/content/worker/websharedworker_stub.cc +++ b/content/worker/websharedworker_stub.cc @@ -12,7 +12,7 @@ #include "content/common/worker_messages.h" #include "content/worker/shared_worker_devtools_agent.h" #include "content/worker/worker_thread.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/public/web/WebSharedWorker.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h index 8c9114b..e4e9ed5 100644 --- a/content/worker/websharedworker_stub.h +++ b/content/worker/websharedworker_stub.h @@ -10,7 +10,7 @@ #include "content/worker/worker_webapplicationcachehost_impl.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_listener.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/public/web/WebSharedWorker.h" namespace WebKit { class WebSharedWorker; diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc index 788b091..427c267 100644 --- a/content/worker/websharedworkerclient_proxy.cc +++ b/content/worker/websharedworkerclient_proxy.cc @@ -18,10 +18,10 @@ #include "content/worker/worker_thread.h" #include "content/worker/worker_webapplicationcachehost_impl.h" #include "ipc/ipc_logging.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#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/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFileSystemCallbacks.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/content/worker/websharedworkerclient_proxy.h b/content/worker/websharedworkerclient_proxy.h index dc906a1..9035c97 100644 --- a/content/worker/websharedworkerclient_proxy.h +++ b/content/worker/websharedworkerclient_proxy.h @@ -10,9 +10,9 @@ #include "ipc/ipc_channel.h" #include "third_party/WebKit/public/platform/WebFileSystem.h" #include "third_party/WebKit/public/platform/WebFileSystemType.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaType.h" +#include "third_party/WebKit/public/web/WebSharedWorkerClient.h" +#include "third_party/WebKit/public/web/WebStorageQuotaCallbacks.h" +#include "third_party/WebKit/public/web/WebStorageQuotaType.h" namespace WebKit { class WebApplicationCacheHost; diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc index a7b4976..5521712 100644 --- a/content/worker/worker_thread.cc +++ b/content/worker/worker_thread.cc @@ -17,9 +17,9 @@ #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/WebDatabase.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/public/web/WebDatabase.h" +#include "third_party/WebKit/public/web/WebKit.h" +#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/platform/WebBlobRegistry.h" #include "webkit/glue/webkit_glue.h" #include "webkit/renderer/appcache/appcache_frontend_impl.h" |