diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:22:09 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:22:09 +0000 |
commit | c1088446ddc0571f98a2d40c1a8cfe86c715ffc1 (patch) | |
tree | 089aa4fe1e448cf03fb6aff1f4d58993cbbfbb19 /webkit/glue | |
parent | 99d618856b2fd530f88c2431aaa5588367d360f9 (diff) | |
download | chromium_src-c1088446ddc0571f98a2d40c1a8cfe86c715ffc1.zip chromium_src-c1088446ddc0571f98a2d40c1a8cfe86c715ffc1.tar.gz chromium_src-c1088446ddc0571f98a2d40c1a8cfe86c715ffc1.tar.bz2 |
Update refernces to Blink's Platform API (webkit)
These headers have moved from Source/Platform/chromium/public to
public/platform. This CL updates src/webkit's references to the old location to
point to the new location. After this CL lands, I'll remove the forwarding
headers that are letting these references still work.
TBR=jamesr@chromium.org
BUG=239545
Review URL: https://chromiumcodereview.appspot.com/15937016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
53 files changed, 134 insertions, 134 deletions
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc index d81a548..8a4afe4 100644 --- a/webkit/glue/cpp_bound_class.cc +++ b/webkit/glue/cpp_bound_class.cc @@ -18,7 +18,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.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/WebFrame.h" diff --git a/webkit/glue/fling_animator_impl_android.cc b/webkit/glue/fling_animator_impl_android.cc index 3189fed..85ef6e1 100644 --- a/webkit/glue/fling_animator_impl_android.cc +++ b/webkit/glue/fling_animator_impl_android.cc @@ -8,8 +8,8 @@ #include "base/android/scoped_java_ref.h" #include "base/logging.h" #include "jni/OverScroller_jni.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" #include "ui/gfx/screen.h" #include "ui/gfx/vector2d.h" diff --git a/webkit/glue/fling_animator_impl_android.h b/webkit/glue/fling_animator_impl_android.h index 5b41d1e..63d4e0c 100644 --- a/webkit/glue/fling_animator_impl_android.h +++ b/webkit/glue/fling_animator_impl_android.h @@ -6,9 +6,9 @@ #define WEBKIT_GLUE_FLING_ANIMATOR_IMPL_ANDROID_H_ #include "base/android/scoped_java_ref.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/gfx/point.h" #include "ui/gfx/point_f.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/fling_curve_configuration.cc b/webkit/glue/fling_curve_configuration.cc index 5d30715..1b0a63a 100644 --- a/webkit/glue/fling_curve_configuration.cc +++ b/webkit/glue/fling_curve_configuration.cc @@ -5,7 +5,7 @@ #include "webkit/glue/fling_curve_configuration.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" #include "webkit/glue/touch_fling_gesture_curve.h" namespace webkit_glue { diff --git a/webkit/glue/fling_curve_configuration.h b/webkit/glue/fling_curve_configuration.h index 548c530..d229ee8 100644 --- a/webkit/glue/fling_curve_configuration.h +++ b/webkit/glue/fling_curve_configuration.h @@ -8,8 +8,8 @@ #include <vector> #include "base/synchronization/lock.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebSize.h" namespace WebKit { class WebGestureCurve; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc index 325e169..dd56ce4 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.cc +++ b/webkit/glue/ftp_directory_listing_response_delegate.cc @@ -17,8 +17,8 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/ftp/ftp_directory_listing_parser.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" #include "webkit/glue/weburlresponse_extradata_impl.h" using net::FtpDirectoryListingEntry; diff --git a/webkit/glue/ftp_directory_listing_response_delegate.h b/webkit/glue/ftp_directory_listing_response_delegate.h index a5cea90..0562049 100644 --- a/webkit/glue/ftp_directory_listing_response_delegate.h +++ b/webkit/glue/ftp_directory_listing_response_delegate.h @@ -11,7 +11,7 @@ #include <string> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" namespace WebKit { class WebURLLoader; diff --git a/webkit/glue/glue_serialize_deprecated.cc b/webkit/glue/glue_serialize_deprecated.cc index b85eed8..0582801 100644 --- a/webkit/glue/glue_serialize_deprecated.cc +++ b/webkit/glue/glue_serialize_deprecated.cc @@ -9,12 +9,12 @@ #include "base/pickle.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebHTTPBody.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" #include "ui/gfx/screen.h" diff --git a/webkit/glue/glue_serialize_unittest.cc b/webkit/glue/glue_serialize_unittest.cc index 3f0dd37..1e9265a 100644 --- a/webkit/glue/glue_serialize_unittest.cc +++ b/webkit/glue/glue_serialize_unittest.cc @@ -7,9 +7,9 @@ #include "base/pickle.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebHTTPBody.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "ui/gfx/screen.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/glue_serialize_deprecated.h" diff --git a/webkit/glue/image_decoder.cc b/webkit/glue/image_decoder.cc index 1429b09..2c30ba1 100644 --- a/webkit/glue/image_decoder.cc +++ b/webkit/glue/image_decoder.cc @@ -4,9 +4,9 @@ #include "webkit/glue/image_decoder.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#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/skia/include/core/SkBitmap.h" using WebKit::WebData; diff --git a/webkit/glue/multipart_response_delegate.cc b/webkit/glue/multipart_response_delegate.cc index e15cfb3..b1aa070 100644 --- a/webkit/glue/multipart_response_delegate.cc +++ b/webkit/glue/multipart_response_delegate.cc @@ -9,10 +9,10 @@ #include "base/strings/string_number_conversions.h" #include "net/base/net_util.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" using WebKit::WebHTTPHeaderVisitor; using WebKit::WebString; diff --git a/webkit/glue/multipart_response_delegate.h b/webkit/glue/multipart_response_delegate.h index e0282b0..10b3171 100644 --- a/webkit/glue/multipart_response_delegate.h +++ b/webkit/glue/multipart_response_delegate.h @@ -52,7 +52,7 @@ #include <string> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/glue/webkit_glue_export.h" namespace WebKit { diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/glue/multipart_response_delegate_unittest.cc index 7522f1f..8e43d85 100644 --- a/webkit/glue/multipart_response_delegate_unittest.cc +++ b/webkit/glue/multipart_response_delegate_unittest.cc @@ -5,10 +5,10 @@ #include <vector> #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/glue/multipart_response_delegate.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index f914bec..3389394 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -33,8 +33,8 @@ #include "net/base/load_timing_info.h" #include "net/base/request_priority.h" #include "net/url_request/url_request_status.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/glue/resource_type.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/resource_type.h b/webkit/glue/resource_type.h index 0bd80ea..f083806 100644 --- a/webkit/glue/resource_type.h +++ b/webkit/glue/resource_type.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_RESOURCE_TYPE_H__ #include "base/basictypes.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/glue/webkit_glue_export.h" class ResourceType { diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc index 7faae4a..6e02693 100644 --- a/webkit/glue/simple_webmimeregistry_impl.cc +++ b/webkit/glue/simple_webmimeregistry_impl.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "media/filters/stream_parser_factory.h" #include "net/base/mime_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/media/crypto/key_systems.h" diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/webkit/glue/simple_webmimeregistry_impl.h index 78eb1f7..cdf6232 100644 --- a/webkit/glue/simple_webmimeregistry_impl.h +++ b/webkit/glue/simple_webmimeregistry_impl.h @@ -6,7 +6,7 @@ #define WEBMIMEREGISTRY_IMPL_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebMimeRegistry.h" +#include "third_party/WebKit/public/platform/WebMimeRegistry.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/touch_fling_gesture_curve.cc b/webkit/glue/touch_fling_gesture_curve.cc index 88a8280..861a0b6 100644 --- a/webkit/glue/touch_fling_gesture_curve.cc +++ b/webkit/glue/touch_fling_gesture_curve.cc @@ -8,11 +8,11 @@ #include "base/debug/trace_event.h" #include "base/logging.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebSize.h" using WebKit::WebFloatPoint; using WebKit::WebFloatSize; diff --git a/webkit/glue/touch_fling_gesture_curve.h b/webkit/glue/touch_fling_gesture_curve.h index 599a4ee..24fda60 100644 --- a/webkit/glue/touch_fling_gesture_curve.h +++ b/webkit/glue/touch_fling_gesture_curve.h @@ -5,10 +5,10 @@ #ifndef WEBKIT_GLUE_TOUCH_FLING_GESTURE_CURVE_H_ #define WEBKIT_GLUE_TOUCH_FLING_GESTURE_CURVE_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "webkit/glue/webkit_glue_export.h" namespace WebKit { diff --git a/webkit/glue/touch_fling_gesture_curve_unittest.cc b/webkit/glue/touch_fling_gesture_curve_unittest.cc index 300b565..b8ed1a5 100644 --- a/webkit/glue/touch_fling_gesture_curve_unittest.cc +++ b/webkit/glue/touch_fling_gesture_curve_unittest.cc @@ -8,11 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurveTarget.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebFloatPoint.h" +#include "third_party/WebKit/public/platform/WebFloatSize.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" +#include "third_party/WebKit/public/platform/WebSize.h" using WebKit::WebFloatPoint; using WebKit::WebFloatSize; diff --git a/webkit/glue/web_discardable_memory_impl.h b/webkit/glue/web_discardable_memory_impl.h index 7f92aff..ced8afe 100644 --- a/webkit/glue/web_discardable_memory_impl.h +++ b/webkit/glue/web_discardable_memory_impl.h @@ -7,7 +7,7 @@ #include "base/memory/discardable_memory.h" #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemory.h" +#include "third_party/WebKit/public/platform/WebDiscardableMemory.h" #include "webkit/glue/webkit_glue_export.h" namespace WebKit { diff --git a/webkit/glue/web_io_operators.cc b/webkit/glue/web_io_operators.cc index 60e441b..c763479 100644 --- a/webkit/glue/web_io_operators.cc +++ b/webkit/glue/web_io_operators.cc @@ -6,14 +6,14 @@ #include <ostream> -#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebPoint.h" +#include "third_party/WebKit/public/platform/WebRect.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #if defined(WCHAR_T_IS_UTF32) #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" +#include "third_party/WebKit/public/platform/WebString.h" #endif // defined(WCHAR_T_IS_UTF32) namespace WebKit { diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 302c81e..a6442d1 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -10,13 +10,13 @@ #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebSize.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/custom_data_helper.h" diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index f9f4498..3943d20 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -6,7 +6,7 @@ #define WEBCLIPBOARD_IMPL_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebClipboard.h" +#include "third_party/WebKit/public/platform/WebClipboard.h" #include "ui/base/clipboard/clipboard.h" #include "webkit/glue/webkit_glue_export.h" diff --git a/webkit/glue/webcursor.cc b/webkit/glue/webcursor.cc index 622e29d..ddeb8ea 100644 --- a/webkit/glue/webcursor.cc +++ b/webkit/glue/webcursor.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/pickle.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" +#include "third_party/WebKit/public/platform/WebImage.h" using WebKit::WebCursorInfo; diff --git a/webkit/glue/webcursor_mac.mm b/webkit/glue/webcursor_mac.mm index 95e545f..d511463 100644 --- a/webkit/glue/webcursor_mac.mm +++ b/webkit/glue/webcursor_mac.mm @@ -12,8 +12,8 @@ #include "base/memory/scoped_nsobject.h" #include "grit/webkit_chromium_resources.h" #include "skia/ext/skia_utils_mac.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.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/WebCursorInfo.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/point_conversions.h" diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc index 5cbfa8a..71d79c1 100644 --- a/webkit/glue/webdropdata.cc +++ b/webkit/glue/webdropdata.cc @@ -9,11 +9,11 @@ #include "base/string_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebDragData.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "ui/base/clipboard/clipboard.h" using WebKit::WebData; diff --git a/webkit/glue/webdropdata.h b/webkit/glue/webdropdata.h index 0df68f0..19b9fae 100644 --- a/webkit/glue/webdropdata.h +++ b/webkit/glue/webdropdata.h @@ -16,7 +16,7 @@ #include "base/nullable_string16.h" #include "base/string16.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "webkit/glue/webkit_glue_export.h" struct IDataObject; diff --git a/webkit/glue/webfallbackthemeengine_impl.cc b/webkit/glue/webfallbackthemeengine_impl.cc index 213e3a7..6a7319e 100644 --- a/webkit/glue/webfallbackthemeengine_impl.cc +++ b/webkit/glue/webfallbackthemeengine_impl.cc @@ -5,8 +5,8 @@ #include "webkit/glue/webfallbackthemeengine_impl.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/native_theme/fallback_theme.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webfallbackthemeengine_impl.h b/webkit/glue/webfallbackthemeengine_impl.h index 0887774..fbdcb8c 100644 --- a/webkit/glue/webfallbackthemeengine_impl.h +++ b/webkit/glue/webfallbackthemeengine_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBFALLBACKTHEMEENGINE_IMPL_H_ #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFallbackThemeEngine.h" +#include "third_party/WebKit/public/platform/WebFallbackThemeEngine.h" namespace ui { class FallbackTheme; diff --git a/webkit/glue/webfileutilities_impl.cc b/webkit/glue/webfileutilities_impl.cc index fb0b831..17b6ef5 100644 --- a/webkit/glue/webfileutilities_impl.cc +++ b/webkit/glue/webfileutilities_impl.cc @@ -9,9 +9,9 @@ #include "base/logging.h" #include "net/base/file_stream.h" #include "net/base/net_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.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" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/webfileutilities_impl.h b/webkit/glue/webfileutilities_impl.h index 741a1c4..a3d2bb2 100644 --- a/webkit/glue/webfileutilities_impl.h +++ b/webkit/glue/webfileutilities_impl.h @@ -6,8 +6,8 @@ #define WEBFILEUTILITIES_IMPL_H_ #include "base/platform_file.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileUtilities.h" +#include "third_party/WebKit/public/platform/WebFileInfo.h" +#include "third_party/WebKit/public/platform/WebFileUtilities.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index c8796cb..6485e58 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -33,13 +33,13 @@ #if defined(OS_MACOSX) #include "skia/ext/skia_utils_mac.h" #endif -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebFileInfo.h" +#include "third_party/WebKit/public/platform/WebImage.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#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/WebDevToolsAgent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 53fe977..3b3d90d2 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -16,8 +16,8 @@ #include "base/platform_file.h" #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "webkit/glue/webkit_glue_export.h" class SkBitmap; diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc index d03d58f..16cb166 100644 --- a/webkit/glue/webkitplatformsupport_impl.cc +++ b/webkit/glue/webkitplatformsupport_impl.cc @@ -29,14 +29,14 @@ #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" #include "net/base/net_errors.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCookie.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemory.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebPluginListBuilder.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" +#include "third_party/WebKit/public/platform/WebCookie.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebDiscardableMemory.h" +#include "third_party/WebKit/public/platform/WebGestureCurve.h" +#include "third_party/WebKit/public/platform/WebPluginListBuilder.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h index e8c2b28..82f3178 100644 --- a/webkit/glue/webkitplatformsupport_impl.h +++ b/webkit/glue/webkitplatformsupport_impl.h @@ -10,8 +10,8 @@ #include "base/platform_file.h" #include "base/threading/thread_local_storage.h" #include "base/timer.h" -#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" +#include "third_party/WebKit/public/platform/Platform.h" +#include "third_party/WebKit/public/platform/WebURLError.h" #include "ui/base/layout.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/webfallbackthemeengine_impl.h" diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 93ecace..a8c16ed 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -7,9 +7,9 @@ #include "base/basictypes.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebSize.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/WebNetworkStateNotifier.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc index 6737439..3a68cbb 100644 --- a/webkit/glue/websocketstreamhandle_impl.cc +++ b/webkit/glue/websocketstreamhandle_impl.cc @@ -13,10 +13,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandleClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebSocketStreamError.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandleClient.h" +#include "third_party/WebKit/public/platform/WebURL.h" #include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/glue/websocketstreamhandle_bridge.h" #include "webkit/glue/websocketstreamhandle_delegate.h" diff --git a/webkit/glue/websocketstreamhandle_impl.h b/webkit/glue/websocketstreamhandle_impl.h index 26de021..827bb88 100644 --- a/webkit/glue/websocketstreamhandle_impl.h +++ b/webkit/glue/websocketstreamhandle_impl.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/supports_user_data.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSocketStreamHandle.h" +#include "third_party/WebKit/public/platform/WebSocketStreamHandle.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_android.cc b/webkit/glue/webthemeengine_impl_android.cc index 8a6dbbb..ee46493 100644 --- a/webkit/glue/webthemeengine_impl_android.cc +++ b/webkit/glue/webthemeengine_impl_android.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/native_theme/native_theme.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webthemeengine_impl_android.h b/webkit/glue/webthemeengine_impl_android.h index d626f80..e2b071e 100644 --- a/webkit/glue/webthemeengine_impl_android.h +++ b/webkit/glue/webthemeengine_impl_android.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_ANDROID_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_ANDROID_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/android/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/android/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_default.cc b/webkit/glue/webthemeengine_impl_default.cc index 198067a..9be9ea8 100644 --- a/webkit/glue/webthemeengine_impl_default.cc +++ b/webkit/glue/webthemeengine_impl_default.cc @@ -5,8 +5,8 @@ #include "webkit/glue/webthemeengine_impl_default.h" #include "skia/ext/platform_canvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/WebKit/public/platform/WebRect.h" +#include "third_party/WebKit/public/platform/WebSize.h" #include "ui/native_theme/native_theme.h" using WebKit::WebCanvas; diff --git a/webkit/glue/webthemeengine_impl_default.h b/webkit/glue/webthemeengine_impl_default.h index 6d37a86..df97812 100644 --- a/webkit/glue/webthemeengine_impl_default.h +++ b/webkit/glue/webthemeengine_impl_default.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_DEFAULT_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/default/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/default/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_mac.cc b/webkit/glue/webthemeengine_impl_mac.cc index 58c6db2..c640bd6 100644 --- a/webkit/glue/webthemeengine_impl_mac.cc +++ b/webkit/glue/webthemeengine_impl_mac.cc @@ -7,8 +7,8 @@ #include <Carbon/Carbon.h> #include "skia/ext/skia_utils_mac.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebCanvas.h" +#include "third_party/WebKit/public/platform/WebRect.h" using WebKit::WebCanvas; using WebKit::WebRect; diff --git a/webkit/glue/webthemeengine_impl_mac.h b/webkit/glue/webthemeengine_impl_mac.h index adaa906..1d952cc 100644 --- a/webkit/glue/webthemeengine_impl_mac.h +++ b/webkit/glue/webthemeengine_impl_mac.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_MAC_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/mac/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/mac/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc index 8bd4b88..c4dde227 100644 --- a/webkit/glue/webthemeengine_impl_win.cc +++ b/webkit/glue/webthemeengine_impl_win.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/skia_utils_win.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" +#include "third_party/WebKit/public/platform/WebRect.h" #include "ui/base/win/dpi.h" #include "ui/native_theme/native_theme.h" diff --git a/webkit/glue/webthemeengine_impl_win.h b/webkit/glue/webthemeengine_impl_win.h index 75e5513..8635cc8 100644 --- a/webkit/glue/webthemeengine_impl_win.h +++ b/webkit/glue/webthemeengine_impl_win.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_WIN_H_ #define WEBKIT_GLUE_WEBTHEMEENGINE_IMPL_WIN_H_ -#include "third_party/WebKit/Source/Platform/chromium/public/win/WebThemeEngine.h" +#include "third_party/WebKit/public/platform/win/WebThemeEngine.h" namespace webkit_glue { diff --git a/webkit/glue/webthread_impl.h b/webkit/glue/webthread_impl.h index be9a4ba..f71a582 100644 --- a/webkit/glue/webthread_impl.h +++ b/webkit/glue/webthread_impl.h @@ -8,7 +8,7 @@ #include "base/threading/thread.h" #include "base/memory/scoped_ptr.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" +#include "third_party/WebKit/public/platform/WebThread.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc index d550422..fcfeb8c 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -20,14 +20,14 @@ #include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPHeaderVisitor.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPLoadInfo.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoaderClient.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoadTiming.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" +#include "third_party/WebKit/public/platform/WebHTTPLoadInfo.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebURLError.h" +#include "third_party/WebKit/public/platform/WebURLLoaderClient.h" +#include "third_party/WebKit/public/platform/WebURLLoadTiming.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/WebSecurityPolicy.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/glue/ftp_directory_listing_response_delegate.h" diff --git a/webkit/glue/weburlloader_impl.h b/webkit/glue/weburlloader_impl.h index 27c28d6..ecca9f4 100644 --- a/webkit/glue/weburlloader_impl.h +++ b/webkit/glue/weburlloader_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_WEBURLLOADER_IMPL_H_ #include "base/memory/ref_counted.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLLoader.h" +#include "third_party/WebKit/public/platform/WebURLLoader.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/weburlrequest_extradata_impl.h b/webkit/glue/weburlrequest_extradata_impl.h index 50688d2..f268303 100644 --- a/webkit/glue/weburlrequest_extradata_impl.h +++ b/webkit/glue/weburlrequest_extradata_impl.h @@ -6,9 +6,9 @@ #define WEBKIT_GLUE_WEBURLREQUEST_EXTRADATA_IMPL_H_ #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/public/platform/WebReferrerPolicy.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/weburlresponse_extradata_impl.h b/webkit/glue/weburlresponse_extradata_impl.h index 0b60bce..84b63e8 100644 --- a/webkit/glue/weburlresponse_extradata_impl.h +++ b/webkit/glue/weburlresponse_extradata_impl.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/public/platform/WebURLResponse.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { diff --git a/webkit/glue/worker_task_runner.h b/webkit/glue/worker_task_runner.h index 49b1cd7..8e84b88 100644 --- a/webkit/glue/worker_task_runner.h +++ b/webkit/glue/worker_task_runner.h @@ -11,7 +11,7 @@ #include "base/callback_forward.h" #include "base/synchronization/lock.h" #include "base/threading/thread_local.h" -#include "third_party/WebKit/Source/Platform/chromium/public/WebWorkerRunLoop.h" +#include "third_party/WebKit/public/platform/WebWorkerRunLoop.h" #include "webkit/glue/webkit_glue_export.h" namespace webkit_glue { |