diff options
32 files changed, 88 insertions, 89 deletions
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS index e8208ed..c535f31 100644 --- a/android_webview/browser/DEPS +++ b/android_webview/browser/DEPS @@ -30,7 +30,7 @@ include_rules = [ "!grit/ui_resources.h", # POD structure required by the find-in-page IPC messages. - "+third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h", + "+third_party/WebKit/public/web/WebFindOptions.h", # Interface required for in-process input event handling. - "+third_party/WebKit/Source/WebKit/chromium/public/WebCompositorInputHandler.h" + "+third_party/WebKit/public/web/WebCompositorInputHandler.h" ] diff --git a/android_webview/browser/find_helper.cc b/android_webview/browser/find_helper.cc index 56dbe49d..63be20c 100644 --- a/android_webview/browser/find_helper.cc +++ b/android_webview/browser/find_helper.cc @@ -9,7 +9,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/stop_find_action.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" +#include "third_party/WebKit/public/web/WebFindOptions.h" using content::WebContents; using WebKit::WebFindOptions; diff --git a/android_webview/renderer/DEPS b/android_webview/renderer/DEPS index b2554bc..2e57f9a 100644 --- a/android_webview/renderer/DEPS +++ b/android_webview/renderer/DEPS @@ -7,8 +7,8 @@ include_rules = [ "+content/public/renderer", - "+third_party/WebKit/Source/WebKit/chromium/public", "+third_party/WebKit/public/platform", + "+third_party/WebKit/public/web", "+ui/gl/gpu_memory_buffer.h", ] diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index 2827fa2..bd37491 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -17,7 +17,7 @@ #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/public/web/WebSecurityPolicy.h" namespace android_webview { diff --git a/android_webview/renderer/aw_render_process_observer.cc b/android_webview/renderer/aw_render_process_observer.cc index 2e68b8a..5e3ecca 100644 --- a/android_webview/renderer/aw_render_process_observer.cc +++ b/android_webview/renderer/aw_render_process_observer.cc @@ -6,7 +6,7 @@ #include "android_webview/common/render_view_messages.h" #include "ipc/ipc_message_macros.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/public/web/WebCache.h" namespace android_webview { diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index 17aa4a6..ddc6f56 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -18,15 +18,15 @@ #include "third_party/WebKit/public/platform/WebSize.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/WebDataSource.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/WebHitTestResult.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebDataSource.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/WebHitTestResult.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebNodeList.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebView.h" namespace android_webview { diff --git a/android_webview/renderer/aw_render_view_ext.h b/android_webview/renderer/aw_render_view_ext.h index f271cb9..d47c1ad 100644 --- a/android_webview/renderer/aw_render_view_ext.h +++ b/android_webview/renderer/aw_render_view_ext.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebPermissionClient.h" +#include "third_party/WebKit/public/web/WebPermissionClient.h" namespace WebKit { diff --git a/components/autofill/content/DEPS b/components/autofill/content/DEPS index 1db9c7d..bd7656f 100644 --- a/components/autofill/content/DEPS +++ b/components/autofill/content/DEPS @@ -2,5 +2,5 @@ include_rules = [ "+content/public/common", # Allow inclusion of WebKit API files. "+third_party/WebKit/public/platform", - "+third_party/WebKit/Source/WebKit/chromium", + "+third_party/WebKit/public/web", ] diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc index 6e9b547..fbf59af 100644 --- a/components/autofill/content/renderer/autofill_agent.cc +++ b/components/autofill/content/renderer/autofill_agent.cc @@ -26,18 +26,18 @@ #include "content/public/common/ssl_status.h" #include "content/public/renderer/render_view.h" #include "grit/component_strings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/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/WebInputEvent.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/WebOptionElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" +#include "third_party/WebKit/public/web/WebDataSource.h" +#include "third_party/WebKit/public/web/WebDocument.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/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebNodeCollection.h" +#include "third_party/WebKit/public/web/WebOptionElement.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h index 0d243ea..4e2db12 100644 --- a/components/autofill/content/renderer/autofill_agent.h +++ b/components/autofill/content/renderer/autofill_agent.h @@ -17,9 +17,9 @@ #include "components/autofill/content/renderer/page_click_listener.h" #include "components/autofill/core/common/forms_seen_state.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" +#include "third_party/WebKit/public/web/WebAutofillClient.h" +#include "third_party/WebKit/public/web/WebFormElement.h" +#include "third_party/WebKit/public/web/WebInputElement.h" namespace WebKit { class WebNode; diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc index 6f7d187..4c36547 100644 --- a/components/autofill/content/renderer/form_autofill_util.cc +++ b/components/autofill/content/renderer/form_autofill_util.cc @@ -16,20 +16,20 @@ #include "components/autofill/core/common/form_data.h" #include "components/autofill/core/common/form_field_data.h" #include "components/autofill/core/common/web_element_descriptor.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/WebExceptionCode.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/WebInputElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebLabelElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebOptionElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebExceptionCode.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/WebInputElement.h" +#include "third_party/WebKit/public/web/WebLabelElement.h" +#include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebNodeList.h" +#include "third_party/WebKit/public/web/WebOptionElement.h" +#include "third_party/WebKit/public/web/WebSelectElement.h" using WebKit::WebDocument; using WebKit::WebElement; diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc index 36eca67..ba4baebf 100644 --- a/components/autofill/content/renderer/form_cache.cc +++ b/components/autofill/content/renderer/form_cache.cc @@ -13,14 +13,14 @@ #include "components/autofill/core/common/form_field_data.h" #include "components/autofill/core/common/form_field_data_predictions.h" #include "grit/component_strings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.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/WebInputElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/WebKit/public/web/WebDocument.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/WebInputElement.h" +#include "third_party/WebKit/public/web/WebSelectElement.h" #include "ui/base/l10n/l10n_util.h" using WebKit::WebDocument; diff --git a/components/autofill/content/renderer/page_click_tracker.cc b/components/autofill/content/renderer/page_click_tracker.cc index 3e6ff3b..ff7cde3 100644 --- a/components/autofill/content/renderer/page_click_tracker.cc +++ b/components/autofill/content/renderer/page_click_tracker.cc @@ -7,13 +7,13 @@ #include "components/autofill/content/renderer/form_autofill_util.h" #include "components/autofill/content/renderer/page_click_listener.h" #include "content/public/renderer/render_view.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMMouseEvent.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/WebInputEvent.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/web/WebDOMMouseEvent.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/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebDOMEvent; using WebKit::WebDOMMouseEvent; diff --git a/components/autofill/content/renderer/page_click_tracker.h b/components/autofill/content/renderer/page_click_tracker.h index c812e77..8328bd1 100644 --- a/components/autofill/content/renderer/page_click_tracker.h +++ b/components/autofill/content/renderer/page_click_tracker.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEventListener.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/public/web/WebDOMEventListener.h" +#include "third_party/WebKit/public/web/WebNode.h" namespace autofill { diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc index a71105e..ab36e6e 100644 --- a/components/autofill/content/renderer/password_autofill_agent.cc +++ b/components/autofill/content/renderer/password_autofill_agent.cc @@ -15,15 +15,15 @@ #include "content/public/common/password_form.h" #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/renderer/render_view.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.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/WebFormElement.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/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/WebKit/public/web/WebAutofillClient.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebElement.h" +#include "third_party/WebKit/public/web/WebFormElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputEvent.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/base/keycodes/keyboard_codes.h" namespace autofill { diff --git a/components/autofill/content/renderer/password_autofill_agent.h b/components/autofill/content/renderer/password_autofill_agent.h index b46a6cd..e35576f 100644 --- a/components/autofill/content/renderer/password_autofill_agent.h +++ b/components/autofill/content/renderer/password_autofill_agent.h @@ -11,7 +11,7 @@ #include "base/memory/weak_ptr.h" #include "components/autofill/core/common/password_form_fill_data.h" #include "content/public/renderer/render_view_observer.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" +#include "third_party/WebKit/public/web/WebInputElement.h" namespace WebKit { class WebInputElement; diff --git a/components/autofill/content/renderer/password_generation_manager.cc b/components/autofill/content/renderer/password_generation_manager.cc index 8047cf8..31d13961 100644 --- a/components/autofill/content/renderer/password_generation_manager.cc +++ b/components/autofill/content/renderer/password_generation_manager.cc @@ -10,15 +10,15 @@ #include "content/public/renderer/password_form_conversion_utils.h" #include "content/public/renderer/render_view.h" #include "google_apis/gaia/gaia_urls.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/WebFrame.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebRect.h" #include "third_party/WebKit/public/platform/WebVector.h" +#include "third_party/WebKit/public/web/WebDocument.h" +#include "third_party/WebKit/public/web/WebFormElement.h" +#include "third_party/WebKit/public/web/WebFrame.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebSecurityOrigin.h" +#include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/rect.h" namespace autofill { diff --git a/components/autofill/content/renderer/password_generation_manager.h b/components/autofill/content/renderer/password_generation_manager.h index 2a2b71a..2092c45 100644 --- a/components/autofill/content/renderer/password_generation_manager.h +++ b/components/autofill/content/renderer/password_generation_manager.h @@ -11,8 +11,8 @@ #include "content/public/renderer/render_view_observer.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextFieldDecoratorClient.h" +#include "third_party/WebKit/public/web/WebInputElement.h" +#include "third_party/WebKit/public/web/WebTextFieldDecoratorClient.h" namespace WebKit { class WebCString; diff --git a/components/autofill/core/DEPS b/components/autofill/core/DEPS index 7b5d601..5049420 100644 --- a/components/autofill/core/DEPS +++ b/components/autofill/core/DEPS @@ -7,5 +7,5 @@ include_rules = [ "!content/public/common/common_param_traits_macros.h", "!content/public/common/password_form.h", "!content/public/common/ssl_status.h", - "!third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h", + "!third_party/WebKit/public/web/WebFormElement.h", ] diff --git a/components/autofill/core/browser/DEPS b/components/autofill/core/browser/DEPS index 4004d48..052b731 100644 --- a/components/autofill/core/browser/DEPS +++ b/components/autofill/core/browser/DEPS @@ -29,8 +29,8 @@ include_rules = [ "!content/public/browser/web_contents_view.h", "!content/public/common/frame_navigate_params.h", "!content/public/common/url_constants.h", - "!third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h", - "!third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h", + "!third_party/WebKit/public/web/WebAutofillClient.h", + "!third_party/WebKit/public/web/WebInputElement.h", # TODO(akalin): Remove this dependency. "!sync/util/data_encryption_win.h", diff --git a/components/autofill/core/browser/autofill_download_unittest.cc b/components/autofill/core/browser/autofill_download_unittest.cc index a9838d9..93ef160 100644 --- a/components/autofill/core/browser/autofill_download_unittest.cc +++ b/components/autofill/core/browser/autofill_download_unittest.cc @@ -21,7 +21,7 @@ #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" +#include "third_party/WebKit/public/web/WebInputElement.h" using content::BrowserThread; using WebKit::WebInputElement; diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc index 0163ca1..346873d 100644 --- a/components/autofill/core/browser/autofill_external_delegate.cc +++ b/components/autofill/core/browser/autofill_external_delegate.cc @@ -15,7 +15,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "grit/component_strings.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" +#include "third_party/WebKit/public/web/WebAutofillClient.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_ANDROID) diff --git a/components/autofill/core/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc index 7967701..907720f 100644 --- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc +++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc @@ -18,7 +18,7 @@ #include "components/autofill/core/common/password_form_fill_data.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" +#include "third_party/WebKit/public/web/WebAutofillClient.h" #include "ui/gfx/rect.h" using testing::_; diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc index 6532b7a..dacafc7 100644 --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc @@ -56,7 +56,7 @@ #include "googleurl/src/gurl.h" #include "grit/component_strings.h" #include "ipc/ipc_message_macros.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" +#include "third_party/WebKit/public/web/WebAutofillClient.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h index 0c47328..73e7620 100644 --- a/components/autofill/core/browser/autofill_manager.h +++ b/components/autofill/core/browser/autofill_manager.h @@ -30,7 +30,7 @@ #include "components/autofill/core/common/form_data.h" #include "components/autofill/core/common/forms_seen_state.h" #include "content/public/common/ssl_status.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" +#include "third_party/WebKit/public/web/WebFormElement.h" class GURL; diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc index ce43c48..fc29c5f 100644 --- a/components/autofill/core/browser/autofill_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_manager_unittest.cc @@ -50,8 +50,8 @@ #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h" +#include "third_party/WebKit/public/web/WebAutofillClient.h" +#include "third_party/WebKit/public/web/WebFormElement.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc index 04c55f4..07eda32 100644 --- a/components/autofill/core/browser/autofill_merge_unittest.cc +++ b/components/autofill/core/browser/autofill_merge_unittest.cc @@ -16,7 +16,7 @@ #include "components/autofill/core/common/form_data.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" +#include "third_party/WebKit/public/web/WebInputElement.h" namespace autofill { diff --git a/components/autofill/core/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc index 90018ef..20bdd0a 100644 --- a/components/autofill/core/browser/form_structure_unittest.cc +++ b/components/autofill/core/browser/form_structure_unittest.cc @@ -13,7 +13,7 @@ #include "components/autofill/core/common/form_field_data.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" +#include "third_party/WebKit/public/web/WebInputElement.h" using WebKit::WebInputElement; diff --git a/components/autofill/core/common/autofill_messages.h b/components/autofill/core/common/autofill_messages.h index dcfe5e8..cc6e28f 100644 --- a/components/autofill/core/common/autofill_messages.h +++ b/components/autofill/core/common/autofill_messages.h @@ -22,7 +22,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/WebFormElement.h" +#include "third_party/WebKit/public/web/WebFormElement.h" #include "ui/gfx/rect.h" #define IPC_MESSAGE_START AutofillMsgStart diff --git a/components/visitedlink/renderer/DEPS b/components/visitedlink/renderer/DEPS index ba7c7da..ad0391c 100644 --- a/components/visitedlink/renderer/DEPS +++ b/components/visitedlink/renderer/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+content/public/renderer", "+third_party/WebKit/public/platform", - "+third_party/WebKit/Source/WebKit/chromium/public", + "+third_party/WebKit/public/web", ] diff --git a/components/visitedlink/renderer/visitedlink_slave.cc b/components/visitedlink/renderer/visitedlink_slave.cc index a42a327..804e10b 100644 --- a/components/visitedlink/renderer/visitedlink_slave.cc +++ b/components/visitedlink/renderer/visitedlink_slave.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/shared_memory.h" #include "components/visitedlink/common/visitedlink_messages.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/public/web/WebView.h" using WebKit::WebView; diff --git a/ui/compositor/test/DEPS b/ui/compositor/test/DEPS index e85ba2d..0223de9 100644 --- a/ui/compositor/test/DEPS +++ b/ui/compositor/test/DEPS @@ -1,4 +1,3 @@ include_rules = [ - "+third_party/WebKit/Source/WebKit/chromium/public", "+webkit/glue", ] |