diff options
Diffstat (limited to 'chrome')
108 files changed, 253 insertions, 251 deletions
diff --git a/chrome/DEPS b/chrome/DEPS index 1e982a0..d3f8343 100644 --- a/chrome/DEPS +++ b/chrome/DEPS @@ -16,7 +16,7 @@ include_rules = [ "-tools", # Allow inclusion of WebKit API files. - "+webkit/api", + "+third_party/WebKit/WebKit/chromium", # Allow inclusion of the appcache library. "+webkit/appcache", diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index 43dae19..12fd1db 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -12,7 +12,7 @@ 'type': 'loadable_module', 'dependencies': [ '../../chrome.gyp:chrome_strings', - '../../../webkit/webkit.gyp:webkit_strings', + '../../../webkit/webkit_glue.gyp:webkit_strings', '../../../app/app.gyp:app_strings', ], 'msvs_settings': { diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc index f736798..86ff2f7 100644 --- a/chrome/browser/gtk/find_bar_gtk.cc +++ b/chrome/browser/gtk/find_bar_gtk.cc @@ -27,7 +27,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" namespace { diff --git a/chrome/browser/gtk/tab_contents_drag_source.h b/chrome/browser/gtk/tab_contents_drag_source.h index cdcc3ed..8a81647 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.h +++ b/chrome/browser/gtk/tab_contents_drag_source.h @@ -10,7 +10,7 @@ #include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/message_loop.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" class TabContents; class TabContentsView; diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc index 6469cea..a6d772a 100644 --- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc +++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" -#include "webkit/api/public/WebData.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebKit::WebClipboard* BrowserWebKitClientImpl::clipboard() { NOTREACHED(); diff --git a/chrome/browser/in_process_webkit/storage_area.cc b/chrome/browser/in_process_webkit/storage_area.cc index 61b9f26..1b8ea59 100644 --- a/chrome/browser/in_process_webkit/storage_area.cc +++ b/chrome/browser/in_process_webkit/storage_area.cc @@ -6,9 +6,9 @@ #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" #include "chrome/browser/in_process_webkit/storage_namespace.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebStorageArea; using WebKit::WebURL; diff --git a/chrome/browser/in_process_webkit/storage_namespace.cc b/chrome/browser/in_process_webkit/storage_namespace.cc index 0d15867..b38303b 100644 --- a/chrome/browser/in_process_webkit/storage_namespace.cc +++ b/chrome/browser/in_process_webkit/storage_namespace.cc @@ -8,8 +8,8 @@ #include "chrome/browser/in_process_webkit/dom_storage_context.h" #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" #include "chrome/browser/in_process_webkit/storage_area.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebStorageNamespace.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebStorageArea; diff --git a/chrome/browser/in_process_webkit/storage_namespace.h b/chrome/browser/in_process_webkit/storage_namespace.h index 9ee2c2b..f6d045a 100644 --- a/chrome/browser/in_process_webkit/storage_namespace.h +++ b/chrome/browser/in_process_webkit/storage_namespace.h @@ -9,7 +9,7 @@ #include "base/hash_tables.h" #include "base/scoped_ptr.h" #include "chrome/common/dom_storage_type.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" class DOMStorageContext; class FilePath; diff --git a/chrome/browser/in_process_webkit/webkit_thread.cc b/chrome/browser/in_process_webkit/webkit_thread.cc index b8df3df..6311140 100644 --- a/chrome/browser/in_process_webkit/webkit_thread.cc +++ b/chrome/browser/in_process_webkit/webkit_thread.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "chrome/browser/in_process_webkit/browser_webkitclient_impl.h" #include "chrome/common/chrome_switches.h" -#include "webkit/api/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" // This happens on the UI thread before the IO thread has been shut down. WebKitThread::WebKitThread() { diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index d170891..2057f70 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -30,7 +30,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" using WebKit::WebNotificationPresenter; diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h index 91c65c8..493c35c 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.h +++ b/chrome/browser/notifications/desktop_notifications_unittest.h @@ -19,7 +19,7 @@ #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" // Mock implementation of Javascript object proxy which logs events that // would have been fired on it. diff --git a/chrome/browser/notifications/notifications_prefs_cache.cc b/chrome/browser/notifications/notifications_prefs_cache.cc index 3ff90d7..d9a4dae 100644 --- a/chrome/browser/notifications/notifications_prefs_cache.cc +++ b/chrome/browser/notifications/notifications_prefs_cache.cc @@ -8,7 +8,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "chrome/common/pref_service.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" NotificationsPrefsCache::NotificationsPrefsCache( const ListValue* allowed, const ListValue* denied) { diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h index 03b2b73..2d01df8 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.h +++ b/chrome/browser/renderer_host/browser_render_process_host.h @@ -19,7 +19,7 @@ #include "chrome/common/transport_dib.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/notification_registrar.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class AudioRendererHost; class CommandLine; diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc index 7bba4a6..c27bb4b 100644 --- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc +++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc @@ -22,7 +22,7 @@ #include "base/string_util.h" #include "base/unix_domain_socket_posix.h" #include "chrome/common/sandbox_methods_linux.h" -#include "webkit/api/public/gtk/WebFontInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebFontInfo.h" #include "SkFontHost_fontconfig_direct.h" #include "SkFontHost_fontconfig_ipc.h" diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 368a9ad..34ba64d 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -39,7 +39,7 @@ #include "chrome/common/url_constants.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebFindOptions.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" #include "webkit/glue/form_field_values.h" #if defined(OS_WIN) diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 9ac9191..a66f371 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -14,9 +14,9 @@ #include "chrome/common/page_zoom.h" #include "chrome/common/view_types.h" #include "net/base/load_states.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" #include "webkit/glue/form_field_values.h" #include "webkit/glue/password_form_dom_manager.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index af87a9e..e8004bd 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -12,7 +12,7 @@ #include "base/string16.h" #include "chrome/common/view_types.h" #include "net/base/load_states.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" #include "webkit/glue/window_open_disposition.h" struct ContextMenuParams; diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index fb5fddc..3e723b4 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -22,8 +22,8 @@ #endif #if defined (OS_MACOSX) -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/mac/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h" #endif using base::Time; diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index 0253336..c8ac6d5 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -18,7 +18,7 @@ #include "chrome/common/property_bag.h" #include "ipc/ipc_channel.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" namespace gfx { class Rect; diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index b19cb46..e5fe05e 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -31,7 +31,7 @@ #include "chrome/browser/renderer_host/gtk_im_context_wrapper.h" #include "chrome/browser/renderer_host/gtk_key_bindings_handler.h" #include "chrome/browser/renderer_host/render_widget_host.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "webkit/glue/webcursor_gtk_data.h" static const int kMaxWindowWidth = 4000; diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index d043a52..95275cb 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -18,8 +18,8 @@ #include "chrome/common/edit_command.h" #include "chrome/common/render_messages.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/mac/WebInputEventFactory.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/webmenurunner_mac.h" using WebKit::WebInputEvent; diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index d01c410..837cdf9 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -30,8 +30,8 @@ #include "chrome/common/render_messages.h" #include "grit/webkit_resources.h" #include "skia/ext/skia_utils_win.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" #include "views/accessibility/view_accessibility.h" #include "views/focus/focus_util_win.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 250b737..577e14a 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -28,7 +28,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/transport_dib.h" #include "ipc/ipc_channel_proxy.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class AppCacheDispatcherHost; class AudioRendererHost; diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc index 5ed8fb0..6c44d81 100644 --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc @@ -22,8 +22,8 @@ #include "chrome/common/x11_util.h" #include "grit/generated_resources.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/x11/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/x11/WebScreenInfoFactory.h" using WebKit::WebScreenInfo; using WebKit::WebScreenInfoFactory; diff --git a/chrome/browser/renderer_host/resource_message_filter_win.cc b/chrome/browser/renderer_host/resource_message_filter_win.cc index b9acece..aa53422 100644 --- a/chrome/browser/renderer_host/resource_message_filter_win.cc +++ b/chrome/browser/renderer_host/resource_message_filter_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/renderer_host/resource_message_filter.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/win/WebScreenInfoFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h" using WebKit::WebScreenInfo; using WebKit::WebScreenInfoFactory; diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h index 82af433..db95280 100644 --- a/chrome/browser/renderer_host/web_cache_manager.h +++ b/chrome/browser/renderer_host/web_cache_manager.h @@ -17,7 +17,7 @@ #include "base/task.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" template<typename Type> struct DefaultSingletonTraits; diff --git a/chrome/browser/ssl/ssl_policy_backend.h b/chrome/browser/ssl/ssl_policy_backend.h index 9e86a6d..059534b 100644 --- a/chrome/browser/ssl/ssl_policy_backend.h +++ b/chrome/browser/ssl/ssl_policy_backend.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "chrome/browser/tab_contents/security_style.h" #include "net/base/x509_certificate.h" -#include "webkit/api/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" class NavigationController; class SSLHostState; diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 41ebc96..f1f6fff 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -33,8 +33,8 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/escape.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" using WebKit::WebContextMenuData; using WebKit::WebMediaPlayerAction; diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.h b/chrome/browser/tab_contents/web_drag_dest_gtk.h index 8bba71e..46e16aa 100644 --- a/chrome/browser/tab_contents/web_drag_dest_gtk.h +++ b/chrome/browser/tab_contents/web_drag_dest_gtk.h @@ -9,7 +9,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" -#include "webkit/api/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" #include "webkit/glue/webdropdata.h" class TabContents; diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h index 2c76a7d..2fe885e 100644 --- a/chrome/browser/task_manager.h +++ b/chrome/browser/task_manager.h @@ -21,7 +21,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "net/url_request/url_request_job_tracker.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; class SkBitmap; diff --git a/chrome/browser/task_manager_resource_providers.h b/chrome/browser/task_manager_resource_providers.h index b374a65..3f76046 100644 --- a/chrome/browser/task_manager_resource_providers.h +++ b/chrome/browser/task_manager_resource_providers.h @@ -13,7 +13,7 @@ #include "chrome/browser/task_manager.h" #include "chrome/common/child_process_info.h" #include "chrome/common/notification_observer.h" -#include "webkit/api/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; class ExtensionHost; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index a8528f9..17e780a 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -31,7 +31,7 @@ 'profile_import', 'worker', '../printing/printing.gyp:printing', - '../webkit/webkit.gyp:inspector_resources', + '../webkit/webkit_glue.gyp:inspector_resources', ], 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'protoc_out_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out', @@ -524,8 +524,8 @@ '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:appcache', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:appcache', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', @@ -791,8 +791,8 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', - '../webkit/webkit.gyp:database', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:database', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', @@ -3173,7 +3173,7 @@ '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -3225,7 +3225,7 @@ 'chrome_resources', 'chrome_strings', '../third_party/npapi/npapi.gyp:npapi', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:glue', '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', @@ -3276,9 +3276,11 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', + # TODO(yaar): Should only stop depending on webcore and depend + # only on webkit. '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', - '../webkit/webkit.gyp:glue', - '../webkit/api/WebKit.gyp:webkit', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', + '../webkit/webkit_glue.gyp:glue', ], 'include_dirs': [ '..', @@ -3474,7 +3476,7 @@ 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18', 'dependencies': [ '../base/base.gyp:base', - '../webkit/api/WebKit.gyp:webkit', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'sources': [ 'worker/nativewebworker_impl.cc', @@ -4475,8 +4477,7 @@ '../net/net.gyp:net_resources', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', - '../webkit/api/WebKit.gyp:webkit', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/webkit_glue.gyp:webkit_resources', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -4485,6 +4486,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'include_dirs': [ '..', @@ -5639,7 +5641,7 @@ '../build/util/support/support.gyp:*', '../third_party/cld/cld.gyp:cld', '../views/views.gyp:views', - '../webkit/webkit.gyp:webkit_resources', + '../webkit/webkit_glue.gyp:webkit_resources', '../gears/gears.gyp:gears', ], 'defines': [ @@ -6333,7 +6335,7 @@ '../base/base.gyp:test_support_perf', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../webkit/webkit.gyp:glue', + '../webkit/webkit_glue.gyp:glue', ], 'sources': [ 'browser/safe_browsing/database_perftest.cc', @@ -6536,7 +6538,7 @@ '../third_party/tcmalloc/tcmalloc.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', - '../webkit/webkit.gyp:*', + '../webkit/webkit_glue.gyp:*', '../build/temp_gyp/googleurl.gyp:*', @@ -6656,13 +6658,13 @@ 'syncapi', 'test_support_unit', '../printing/printing.gyp:printing', - '../webkit/api/WebKit.gyp:webkit', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', + '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit', ], 'include_dirs': [ '..', diff --git a/chrome/common/css_colors.h b/chrome/common/css_colors.h index 994a3907..d952e98 100644 --- a/chrome/common/css_colors.h +++ b/chrome/common/css_colors.h @@ -8,8 +8,8 @@ #include <utility> #include "base/basictypes.h" -#include "webkit/api/public/WebColor.h" -#include "webkit/api/public/WebColorName.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColor.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColorName.h" // Functionality related to sending the values of CSS colors to the renderer. class CSSColors { diff --git a/chrome/common/db_message_filter.cc b/chrome/common/db_message_filter.cc index 939c6e8..a3e6bd8 100644 --- a/chrome/common/db_message_filter.cc +++ b/chrome/common/db_message_filter.cc @@ -6,7 +6,7 @@ #include "chrome/common/child_process.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" DBMessageFilter* DBMessageFilter::instance_ = NULL; diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/chrome/common/desktop_notifications/active_notification_tracker.cc index 230d76a..3357ab3 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.cc +++ b/chrome/common/desktop_notifications/active_notification_tracker.cc @@ -5,8 +5,8 @@ #include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "base/message_loop.h" -#include "webkit/api/public/WebNotification.h" -#include "webkit/api/public/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h" using WebKit::WebNotification; using WebKit::WebNotificationPermissionCallback; diff --git a/chrome/common/desktop_notifications/active_notification_tracker.h b/chrome/common/desktop_notifications/active_notification_tracker.h index 4bdd5d9..b25c42e 100644 --- a/chrome/common/desktop_notifications/active_notification_tracker.h +++ b/chrome/common/desktop_notifications/active_notification_tracker.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/id_map.h" #include "base/hash_tables.h" -#include "webkit/api/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" namespace WebKit { class WebNotificationPermissionCallback; diff --git a/chrome/common/native_web_keyboard_event.h b/chrome/common/native_web_keyboard_event.h index 654c38b..4edf0e2 100644 --- a/chrome/common/native_web_keyboard_event.h +++ b/chrome/common/native_web_keyboard_event.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_ #include "base/basictypes.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chrome/common/native_web_keyboard_event_linux.cc b/chrome/common/native_web_keyboard_event_linux.cc index 6df2290..3daeb47 100644 --- a/chrome/common/native_web_keyboard_event_linux.cc +++ b/chrome/common/native_web_keyboard_event_linux.cc @@ -4,7 +4,7 @@ #include "chrome/common/native_web_keyboard_event.h" -#include "webkit/api/public/gtk/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/chrome/common/native_web_keyboard_event_mac.mm b/chrome/common/native_web_keyboard_event_mac.mm index 59e0ace..0c11033 100644 --- a/chrome/common/native_web_keyboard_event_mac.mm +++ b/chrome/common/native_web_keyboard_event_mac.mm @@ -6,7 +6,7 @@ #import <AppKit/AppKit.h> -#include "webkit/api/public/mac/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" using WebKit::WebInputEventFactory; diff --git a/chrome/common/native_web_keyboard_event_win.cc b/chrome/common/native_web_keyboard_event_win.cc index b98f28b..a2ba45f 100644 --- a/chrome/common/native_web_keyboard_event_win.cc +++ b/chrome/common/native_web_keyboard_event_win.cc @@ -4,7 +4,7 @@ #include "chrome/common/native_web_keyboard_event.h" -#include "webkit/api/public/win/WebInputEventFactory.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h" using WebKit::WebInputEventFactory; using WebKit::WebKeyboardEvent; diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h index 6ce53b8..c4c70fb 100644 --- a/chrome/common/plugin_messages.h +++ b/chrome/common/plugin_messages.h @@ -21,8 +21,8 @@ #include "googleurl/src/gurl.h" #include "ipc/ipc_message_utils.h" #include "third_party/npapi/bindings/npapi.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/npruntime_util.h" // Name prefix of the event handle when a message box is displayed. diff --git a/chrome/common/webkit_param_traits.h b/chrome/common/webkit_param_traits.h index dacaf08..5dfd90d 100644 --- a/chrome/common/webkit_param_traits.h +++ b/chrome/common/webkit_param_traits.h @@ -24,16 +24,16 @@ #define CHROME_COMMON_WEBKIT_PARAM_TRAITS_H_ #include "ipc/ipc_message_utils.h" -#include "webkit/api/public/WebCache.h" -#include "webkit/api/public/WebCompositionCommand.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebFindOptions.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" namespace IPC { diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc index f585355..17b4fb8 100644 --- a/chrome/common/webmessageportchannel_impl.cc +++ b/chrome/common/webmessageportchannel_impl.cc @@ -7,8 +7,8 @@ #include "chrome/common/child_process.h" #include "chrome/common/child_thread.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebMessagePortChannelClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannelClient.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/common/webmessageportchannel_impl.h b/chrome/common/webmessageportchannel_impl.h index 89a36b0..da52b9d 100644 --- a/chrome/common/webmessageportchannel_impl.h +++ b/chrome/common/webmessageportchannel_impl.h @@ -13,7 +13,7 @@ #include "base/string16.h" #include "base/ref_counted.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebMessagePortChannel.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMessagePortChannel.h" // This is thread safe. class WebMessagePortChannelImpl diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc index 8071141..01cc4c7 100644 --- a/chrome/plugin/npobject_proxy.cc +++ b/chrome/plugin/npobject_proxy.cc @@ -7,7 +7,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/plugin/npobject_util.h" #include "chrome/plugin/plugin_channel.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/plugins/plugin_instance.h" diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc index 7b0e213..958ad55 100644 --- a/chrome/plugin/npobject_stub.cc +++ b/chrome/plugin/npobject_stub.cc @@ -11,7 +11,7 @@ #include "chrome/plugin/plugin_thread.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/plugin_constants_win.h" using WebKit::WebBindings; diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc index 71d866e..7594225 100644 --- a/chrome/plugin/npobject_util.cc +++ b/chrome/plugin/npobject_util.cc @@ -8,7 +8,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/plugin/npobject_proxy.h" #include "chrome/plugin/plugin_channel_base.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/nphostapi.h" #include "webkit/glue/plugins/plugin_host.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index ac19f31..c02b42f 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -18,8 +18,8 @@ #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 9983315..61ecc7e 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -28,7 +28,7 @@ #include "chrome/plugin/plugin_thread.h" #include "chrome/plugin/webplugin_delegate_stub.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" using WebKit::WebBindings; diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc index 87dc832..aad6ceb 100644 --- a/chrome/renderer/devtools_agent.cc +++ b/chrome/renderer/devtools_agent.cc @@ -7,9 +7,9 @@ #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/glue_util.h" using WebKit::WebDevToolsAgent; diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h index 9f52e9e..26a6297 100644 --- a/chrome/renderer/devtools_agent.h +++ b/chrome/renderer/devtools_agent.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "webkit/api/public/WebDevToolsAgentClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" namespace IPC { class Message; diff --git a/chrome/renderer/devtools_agent_filter.cc b/chrome/renderer/devtools_agent_filter.cc index 8049868..f67f183 100644 --- a/chrome/renderer/devtools_agent_filter.cc +++ b/chrome/renderer/devtools_agent_filter.cc @@ -9,8 +9,8 @@ #include "chrome/renderer/devtools_agent.h" #include "chrome/renderer/plugin_channel_host.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebDevToolsAgent; using WebKit::WebString; diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc index c950fb5..9b17c8b 100644 --- a/chrome/renderer/devtools_client.cc +++ b/chrome/renderer/devtools_client.cc @@ -10,8 +10,8 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebDevToolsFrontend.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontend.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" using WebKit::WebDevToolsFrontend; using WebKit::WebString; diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h index a380255..e83ec12 100644 --- a/chrome/renderer/devtools_client.h +++ b/chrome/renderer/devtools_client.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "webkit/api/public/WebDevToolsFrontendClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsFrontendClient.h" namespace IPC { class Message; diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index 6c35b25..988068e 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index e23c060..ba7e898 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,9 +14,9 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "grit/renderer_resources.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" using bindings_utils::CallFunctionInContext; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index fee736a..ce5295a 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -25,10 +25,10 @@ #include "grit/renderer_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" using bindings_utils::GetStringResource; using bindings_utils::ContextInfo; diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc index c647de4..f0e0bd5 100644 --- a/chrome/renderer/external_extension.cc +++ b/chrome/renderer/external_extension.cc @@ -4,7 +4,7 @@ #include "chrome/renderer/external_extension.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; using WebKit::WebView; diff --git a/chrome/renderer/external_host_bindings.cc b/chrome/renderer/external_host_bindings.cc index 1ab3cc0..51a71bc 100644 --- a/chrome/renderer/external_host_bindings.cc +++ b/chrome/renderer/external_host_bindings.cc @@ -6,8 +6,8 @@ #include "base/values.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebBindings; diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc index e68c8e4..8688a56 100644 --- a/chrome/renderer/loadtimes_extension_bindings.cc +++ b/chrome/renderer/loadtimes_extension_bindings.cc @@ -8,7 +8,7 @@ #include "base/time.h" #include "chrome/renderer/navigation_state.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "v8/include/v8.h" using WebKit::WebDataSource; diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index e95e937..2b49390 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -12,7 +12,7 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebURLError; diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h index 5f3191d..90c1270 100644 --- a/chrome/renderer/navigation_state.h +++ b/chrome/renderer/navigation_state.h @@ -9,8 +9,8 @@ #include "base/time.h" #include "chrome/common/page_transition_types.h" #include "chrome/renderer/user_script_idle_scheduler.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/password_form.h" diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc index 2862e4a..9510cab 100644 --- a/chrome/renderer/notification_provider.cc +++ b/chrome/renderer/notification_provider.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebNotificationPermissionCallback.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h" using WebKit::WebNotification; using WebKit::WebNotificationPresenter; diff --git a/chrome/renderer/notification_provider.h b/chrome/renderer/notification_provider.h index f08d031..d02ee15 100644 --- a/chrome/renderer/notification_provider.h +++ b/chrome/renderer/notification_provider.h @@ -9,8 +9,8 @@ #include "chrome/common/desktop_notifications/active_notification_tracker.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebNotification.h" -#include "webkit/api/public/WebNotificationPresenter.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" class RenderView; namespace WebKit { diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index fe49462..32e4064 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -11,11 +11,11 @@ #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/units.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFrame; diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h index eb3ffaf..44ae591 100644 --- a/chrome/renderer/print_web_view_helper.h +++ b/chrome/renderer/print_web_view_helper.h @@ -10,7 +10,7 @@ #include "base/gfx/size.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "webkit/api/public/WebViewClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" namespace gfx { class Size; diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc index dd1c986..4b2f92f 100644 --- a/chrome/renderer/print_web_view_helper_linux.cc +++ b/chrome/renderer/print_web_view_helper_linux.cc @@ -9,7 +9,7 @@ #include "chrome/common/render_messages.h" #include "printing/native_metafile.h" #include "skia/ext/vector_canvas.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebFrame; diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index 98b26e5..ae579bb 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -14,9 +14,9 @@ #include "chrome/renderer/render_view.h" #include "grit/generated_resources.h" #include "printing/native_metafile.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebCanvas.h" -#include "webkit/api/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" using WebKit::WebFrame; using WebKit::WebCanvas; diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc index c5bf711..b3b64ea 100644 --- a/chrome/renderer/print_web_view_helper_win.cc +++ b/chrome/renderer/print_web_view_helper_win.cc @@ -12,8 +12,8 @@ #include "grit/generated_resources.h" #include "printing/native_metafile.h" #include "skia/ext/vector_canvas.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" using WebKit::WebConsoleMessage; using WebKit::WebFrame; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index a388929..a165b09 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -59,17 +59,17 @@ #include "chrome/renderer/user_script_slave.h" #include "ipc/ipc_message.h" #include "third_party/tcmalloc/tcmalloc/src/google/malloc_extension.h" -#include "webkit/api/public/WebCache.h" -#include "webkit/api/public/WebColor.h" -#include "webkit/api/public/WebCrossOriginPreflightResultCache.h" -#include "webkit/api/public/WebDatabase.h" -#include "webkit/api/public/WebFontCache.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebRuntimeFeatures.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebSecurityPolicy.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebColor.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFontCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/extensions/v8/benchmarking_extension.h" #include "webkit/extensions/v8/gears_extension.h" #include "webkit/extensions/v8/interval_extension.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 245b6f5..006ae43 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -68,28 +68,28 @@ #include "net/base/net_errors.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/image_operations.h" -#include "webkit/api/public/WebAccessibilityCache.h" -#include "webkit/api/public/WebAccessibilityObject.h" -#include "webkit/api/public/WebDataSource.h" -#include "webkit/api/public/WebDevToolsAgent.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFormElement.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebHistoryItem.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebPoint.h" -#include "webkit/api/public/WebRange.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebSearchableFormData.h" -#include "webkit/api/public/WebSecurityOrigin.h" -#include "webkit/api/public/WebSize.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebURLError.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebURLResponse.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h" +#include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRange.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSearchableFormData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "webkit/appcache/appcache_interfaces.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/glue_serialize.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 53d7e95..e15438f 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -35,14 +35,14 @@ #include "chrome/renderer/render_view_visitor.h" #include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" -#include "webkit/api/public/WebConsoleMessage.h" -#include "webkit/api/public/WebContextMenuData.h" -#include "webkit/api/public/WebFrameClient.h" -#include "webkit/api/public/WebMediaPlayerAction.h" -#include "webkit/api/public/WebNode.h" -#include "webkit/api/public/WebTextDirection.h" -#include "webkit/api/public/WebView.h" -#include "webkit/api/public/WebViewClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" +#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" +#include "third_party/WebKit/WebKit/chromium/public/WebNode.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" #include "webkit/glue/dom_serializer_delegate.h" #include "webkit/glue/form_data.h" #include "webkit/glue/image_resource_fetcher.h" diff --git a/chrome/renderer/render_view_linux.cc b/chrome/renderer/render_view_linux.cc index 9cc8a64..40f5fe1 100644 --- a/chrome/renderer/render_view_linux.cc +++ b/chrome/renderer/render_view_linux.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/render_view.h" #include "chrome/common/renderer_preferences.h" -#include "webkit/api/public/linux/WebFontRendering.h" +#include "third_party/WebKit/WebKit/chromium/public/linux/WebFontRendering.h" using WebKit::WebFontRendering; diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc index 7a8172d..8afdbf6 100644 --- a/chrome/renderer/render_view_unittest.cc +++ b/chrome/renderer/render_view_unittest.cc @@ -13,8 +13,8 @@ #include "printing/image.h" #include "printing/native_metafile.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURLError.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLError.h" using WebKit::WebCompositionCommand; using WebKit::WebFrame; diff --git a/chrome/renderer/render_view_unittest_mac.mm b/chrome/renderer/render_view_unittest_mac.mm index a83af57..f8880c7 100644 --- a/chrome/renderer/render_view_unittest_mac.mm +++ b/chrome/renderer/render_view_unittest_mac.mm @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/test/render_view_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include <Cocoa/Cocoa.h> #include <Carbon/Carbon.h> // for the kVK_* constants. diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 0c5e970..85ecf77 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -15,12 +15,12 @@ #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkShader.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebPopupMenu.h" -#include "webkit/api/public/WebPopupMenuInfo.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebScreenInfo.h" -#include "webkit/api/public/WebSize.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupMenuInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSize.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_POSIX) @@ -28,7 +28,7 @@ #include "third_party/skia/include/core/SkMallocPixelRef.h" #endif // defined(OS_POSIX) -#include "webkit/api/public/WebWidget.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWidget.h" using WebKit::WebCompositionCommand; using WebKit::WebCursorInfo; diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 7428ec3..df17bd1 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -18,10 +18,10 @@ #include "ipc/ipc_channel.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebCompositionCommand.h" -#include "webkit/api/public/WebRect.h" -#include "webkit/api/public/WebTextDirection.h" -#include "webkit/api/public/WebWidgetClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h" +#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" +#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWidgetClient.h" #include "webkit/glue/webcursor.h" class RenderThreadBase; diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index c22820a..558589c 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -27,9 +27,9 @@ #include "chrome/renderer/socket_stream_dispatcher.h" #include "googleurl/src/url_util.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/websocketstreamhandle_bridge.h" diff --git a/chrome/renderer/renderer_web_database_observer.cc b/chrome/renderer/renderer_web_database_observer.cc index d99dfb4..15a5d17 100644 --- a/chrome/renderer/renderer_web_database_observer.cc +++ b/chrome/renderer/renderer_web_database_observer.cc @@ -5,7 +5,7 @@ #include "chrome/renderer/renderer_web_database_observer.h" #include "chrome/common/render_messages.h" -#include "webkit/api/public/WebDatabase.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" RendererWebDatabaseObserver::RendererWebDatabaseObserver( IPC::Message::Sender* sender) diff --git a/chrome/renderer/renderer_web_database_observer.h b/chrome/renderer/renderer_web_database_observer.h index 4e09b53..4c06853 100644 --- a/chrome/renderer/renderer_web_database_observer.h +++ b/chrome/renderer/renderer_web_database_observer.h @@ -6,7 +6,7 @@ #define CHROME_RENDERER_RENDERER_WEB_DATABASE_OBSERVER_H_ #include "ipc/ipc_message.h" -#include "webkit/api/public/WebDatabaseObserver.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDatabaseObserver.h" class RendererWebDatabaseObserver : public WebKit::WebDatabaseObserver { public: diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index d671a3f..cec8119 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -24,11 +24,11 @@ #include "chrome/renderer/renderer_webstoragenamespace_impl.h" #include "chrome/renderer/visitedlink_slave.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebCookie.h" -#include "webkit/api/public/WebStorageEventDispatcher.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCookie.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h index 326d3a6..19e88a8 100644 --- a/chrome/renderer/renderer_webkitclient_impl.h +++ b/chrome/renderer/renderer_webkitclient_impl.h @@ -12,12 +12,12 @@ #include "webkit/glue/webkitclient_impl.h" #if defined(OS_WIN) -#include "webkit/api/public/win/WebSandboxSupport.h" +#include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h" #elif defined(OS_LINUX) #include <string> #include <map> #include "base/lock.h" -#include "webkit/api/public/linux/WebSandboxSupport.h" +#include "third_party/WebKit/WebKit/chromium/public/linux/WebSandboxSupport.h" #endif class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl { diff --git a/chrome/renderer/renderer_webstoragearea_impl.cc b/chrome/renderer/renderer_webstoragearea_impl.cc index 3ddc29c..95e688e 100644 --- a/chrome/renderer/renderer_webstoragearea_impl.cc +++ b/chrome/renderer/renderer_webstoragearea_impl.cc @@ -6,7 +6,7 @@ #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebString; using WebKit::WebURL; diff --git a/chrome/renderer/renderer_webstoragearea_impl.h b/chrome/renderer/renderer_webstoragearea_impl.h index c61a0f1..2a13bf8 100644 --- a/chrome/renderer/renderer_webstoragearea_impl.h +++ b/chrome/renderer/renderer_webstoragearea_impl.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "webkit/api/public/WebStorageArea.h" -#include "webkit/api/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" class RendererWebStorageAreaImpl : public WebKit::WebStorageArea { public: diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h index c5a6dfb7..fd01435 100644 --- a/chrome/renderer/renderer_webstoragenamespace_impl.h +++ b/chrome/renderer/renderer_webstoragenamespace_impl.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "chrome/common/dom_storage_type.h" -#include "webkit/api/public/WebStorageNamespace.h" +#include "third_party/WebKit/WebKit/chromium/public/WebStorageNamespace.h" class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace { public: diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 9fff626..6aafd4a 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "chrome/renderer/extension_groups.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h index 3d7c49d..5d3ae6b 100644 --- a/chrome/renderer/user_script_slave.h +++ b/chrome/renderer/user_script_slave.h @@ -14,7 +14,7 @@ #include "base/stl_util-inl.h" #include "base/string_piece.h" #include "chrome/common/extensions/user_script.h" -#include "webkit/api/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" namespace WebKit { class WebFrame; diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h index 740c7db..4adbc40 100644 --- a/chrome/renderer/webmediaplayer_impl.h +++ b/chrome/renderer/webmediaplayer_impl.h @@ -50,8 +50,8 @@ #include "media/base/filters.h" #include "media/base/pipeline_impl.h" #include "skia/ext/platform_canvas.h" -#include "webkit/api/public/WebMediaPlayer.h" -#include "webkit/api/public/WebMediaPlayerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayer.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerClient.h" class AudioRendererImpl; class DataSourceImpl; diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc index b7ab0f5..ecb4984 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -18,7 +18,7 @@ #include "base/string_util.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" -#include "webkit/api/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/pepper/pepper.h" #include "webkit/glue/plugins/plugin_constants_win.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index db7a42a..3853115 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -29,13 +29,13 @@ #include "grit/renderer_resources.h" #include "net/base/mime_util.h" #include "printing/native_metafile.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebCursorInfo.h" -#include "webkit/api/public/WebDragData.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebVector.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebVector.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/renderer/websharedworker_proxy.cc b/chrome/renderer/websharedworker_proxy.cc index 5bcde88..7ad1f61 100644 --- a/chrome/renderer/websharedworker_proxy.cc +++ b/chrome/renderer/websharedworker_proxy.cc @@ -7,7 +7,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread, int route_id, diff --git a/chrome/renderer/websharedworker_proxy.h b/chrome/renderer/websharedworker_proxy.h index 6adcf08..68dab47 100644 --- a/chrome/renderer/websharedworker_proxy.h +++ b/chrome/renderer/websharedworker_proxy.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/renderer/webworker_base.h" #include "googleurl/src/gurl.h" -#include "webkit/api/public/WebSharedWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorker.h" class ChildThread; diff --git a/chrome/renderer/websharedworkerrepository_impl.h b/chrome/renderer/websharedworkerrepository_impl.h index 4083202..d8cec99 100644 --- a/chrome/renderer/websharedworkerrepository_impl.h +++ b/chrome/renderer/websharedworkerrepository_impl.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_ #define CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_ -#include "webkit/api/public/WebSharedWorkerRepository.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorkerRepository.h" namespace WebKit { class WebSharedWorker; diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc index 1364e7a..e32026c 100644 --- a/chrome/renderer/webworker_base.cc +++ b/chrome/renderer/webworker_base.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc index e8a5b9d..a263565 100644 --- a/chrome/renderer/webworker_proxy.cc +++ b/chrome/renderer/webworker_proxy.cc @@ -8,8 +8,8 @@ #include "chrome/common/render_messages.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" using WebKit::WebCommonWorkerClient; using WebKit::WebMessagePortChannel; diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h index 48487c0..fb2db3ed 100644 --- a/chrome/renderer/webworker_proxy.h +++ b/chrome/renderer/webworker_proxy.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "chrome/renderer/webworker_base.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" class ChildThread; class GURL; diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index 7f0838c..1e8cc2b 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -20,7 +20,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', # run time dependency - '<(DEPTH)/webkit/webkit.gyp:webkit_resources', + '<(DEPTH)/webkit/webkit_glue.gyp:webkit_resources', ], 'include_dirs': [ '<(DEPTH)', diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc index ccd7da5..883be1a 100644 --- a/chrome/test/render_view_test.cc +++ b/chrome/test/render_view_test.cc @@ -14,13 +14,13 @@ #include "chrome/renderer/extensions/js_only_v8_extensions.h" #include "chrome/renderer/extensions/renderer_extension_bindings.h" #include "chrome/renderer/renderer_main_platform_delegate.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebInputEvent.h" -#include "webkit/api/public/WebKit.h" -#include "webkit/api/public/WebScriptController.h" -#include "webkit/api/public/WebScriptSource.h" -#include "webkit/api/public/WebURLRequest.h" -#include "webkit/api/public/WebView.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebView.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebFrame; diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h index df4e2d3..add9d55 100644 --- a/chrome/test/render_view_test.h +++ b/chrome/test/render_view_test.h @@ -19,7 +19,7 @@ #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/renderer_webkitclient_impl.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/api/public/WebFrame.h" +#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" class RenderViewTest : public testing::Test { public: diff --git a/chrome/worker/nativewebworker_impl.cc b/chrome/worker/nativewebworker_impl.cc index 58a5c07..d647086 100644 --- a/chrome/worker/nativewebworker_impl.cc +++ b/chrome/worker/nativewebworker_impl.cc @@ -11,10 +11,10 @@ #include "base/logging.h" #include "webkit/glue/glue_util.h" #include "base/thread.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebKitClient.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" // TODO(sehr): This will be changed to point to the real NaCl headers once // the builds are integrated. diff --git a/chrome/worker/nativewebworker_impl.h b/chrome/worker/nativewebworker_impl.h index 2407136..ac7e801 100644 --- a/chrome/worker/nativewebworker_impl.h +++ b/chrome/worker/nativewebworker_impl.h @@ -6,8 +6,8 @@ #define CHROME_WORKER_NATIVEWORKER_H_ #include "base/basictypes.h" -#include "webkit/api/public/WebWorker.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" // Forward declaration for the listener thread pointer. diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc index 1860f29..3c7aa3e 100644 --- a/chrome/worker/websharedworker_stub.cc +++ b/chrome/worker/websharedworker_stub.cc @@ -6,9 +6,9 @@ #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" -#include "webkit/api/public/WebSharedWorker.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebSharedWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" WebSharedWorkerStub::WebSharedWorkerStub( const string16& name, int route_id) diff --git a/chrome/worker/webworker_stub.cc b/chrome/worker/webworker_stub.cc index 37be7ab..33a9b60 100644 --- a/chrome/worker/webworker_stub.cc +++ b/chrome/worker/webworker_stub.cc @@ -9,9 +9,9 @@ #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/common/worker_messages.h" #include "chrome/worker/nativewebworker_impl.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" using WebKit::WebWorker; diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc index 35b2a28..8519c23 100644 --- a/chrome/worker/webworkerclient_proxy.cc +++ b/chrome/worker/webworkerclient_proxy.cc @@ -12,9 +12,9 @@ #include "chrome/worker/webworker_stub_base.h" #include "chrome/worker/worker_thread.h" #include "ipc/ipc_logging.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" -#include "webkit/api/public/WebWorker.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h" using WebKit::WebMessagePortChannel; using WebKit::WebMessagePortChannelArray; diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h index 1f91b7e..92229c2 100644 --- a/chrome/worker/webworkerclient_proxy.h +++ b/chrome/worker/webworkerclient_proxy.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/task.h" #include "ipc/ipc_channel.h" -#include "webkit/api/public/WebWorkerClient.h" +#include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h" namespace WebKit { class WebWorker; diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc index 8ffc92b..e05e15c 100644 --- a/chrome/worker/worker_thread.cc +++ b/chrome/worker/worker_thread.cc @@ -10,7 +10,7 @@ #include "chrome/worker/webworker_stub.h" #include "chrome/worker/websharedworker_stub.h" #include "chrome/worker/worker_webkitclient_impl.h" -#include "webkit/api/public/WebKit.h" +#include "third_party/WebKit/WebKit/chromium/public/WebKit.h" static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls( base::LINKER_INITIALIZED); diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index c8df883..12ed15a 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/common/webmessageportchannel_impl.h" #include "chrome/worker/worker_thread.h" -#include "webkit/api/public/WebString.h" -#include "webkit/api/public/WebURL.h" +#include "third_party/WebKit/WebKit/chromium/public/WebString.h" +#include "third_party/WebKit/WebKit/chromium/public/WebURL.h" using WebKit::WebClipboard; using WebKit::WebMessagePortChannel; diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h index b0dcb68..0cb213c 100644 --- a/chrome/worker/worker_webkitclient_impl.h +++ b/chrome/worker/worker_webkitclient_impl.h @@ -5,7 +5,7 @@ #ifndef CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_ #define CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_ -#include "webkit/api/public/WebMimeRegistry.h" +#include "third_party/WebKit/WebKit/chromium/public/WebMimeRegistry.h" #include "webkit/glue/webkitclient_impl.h" class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl, |