diff options
Diffstat (limited to 'chrome')
19 files changed, 19 insertions, 22 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h index dec16d2..88cf5ef 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.h +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h @@ -14,7 +14,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" class GURL; class Profile; diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h index f4c8f75..c79d482 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h" #include "chrome/common/extensions/api/events.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" namespace base { class Value; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index e62f3f9..f63ffd6 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -40,7 +40,7 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" using content::WebContents; diff --git a/chrome/browser/extensions/api/web_request/web_request_api.h b/chrome/browser/extensions/api/web_request/web_request_api.h index e0339fc..4e9ea49 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.h +++ b/chrome/browser/extensions/api/web_request/web_request_api.h @@ -25,7 +25,7 @@ #include "net/base/completion_callback.h" #include "net/base/network_delegate.h" #include "net/http/http_request_headers.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" class ExtensionInfoMap; class ExtensionWebRequestTimeTracker; diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h index 90b2f84..9b849c1 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.h +++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.h @@ -20,7 +20,7 @@ #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "url/gurl.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" namespace base { class ListValue; diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 47241e9..a8a0108 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -36,7 +36,7 @@ #include "content/public/common/result_codes.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" using extensions::Extension; using extensions::ExtensionAPI; diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h index 009a9d74..d4f6c4a 100644 --- a/chrome/browser/extensions/user_script_listener.h +++ b/chrome/browser/extensions/user_script_listener.h @@ -15,7 +15,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" class GURL; class URLPattern; diff --git a/chrome/browser/net/resource_prefetch_predictor_observer.h b/chrome/browser/net/resource_prefetch_predictor_observer.h index 3790f0a..5ffb27b 100644 --- a/chrome/browser/net/resource_prefetch_predictor_observer.h +++ b/chrome/browser/net/resource_prefetch_predictor_observer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" namespace net { class URLRequest; diff --git a/chrome/browser/predictors/resource_prefetch_predictor.h b/chrome/browser/predictors/resource_prefetch_predictor.h index ed177e4..3776241 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.h +++ b/chrome/browser/predictors/resource_prefetch_predictor.h @@ -23,7 +23,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "url/gurl.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" class PredictorsHandler; class Profile; diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.h b/chrome/browser/predictors/resource_prefetch_predictor_tables.h index 6995388..f8a965e 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.h +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.h @@ -14,7 +14,7 @@ #include "chrome/browser/predictors/predictor_table_base.h" #include "chrome/browser/predictors/resource_prefetch_common.h" #include "url/gurl.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" namespace sql { class Statement; diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.cc b/chrome/browser/ui/webui/predictors/predictors_handler.cc index 3536ac9..14c88cf 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.cc +++ b/chrome/browser/ui/webui/predictors/predictors_handler.cc @@ -13,7 +13,7 @@ #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui.h" -#include "webkit/common/resource_type.h" +#include "webkit/glue/resource_type.h" using predictors::AutocompleteActionPredictor; using predictors::ResourcePrefetchPredictor; diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index fa6d12d..261a81a 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -19,15 +19,14 @@ '../net/net.gyp:net', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', - '../third_party/WebKit/public/blink.gyp:blink', '../third_party/hunspell/hunspell.gyp:hunspell', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', '../third_party/re2/re2.gyp:re2', + '../third_party/WebKit/public/blink.gyp:blink', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', '../ui/surface/surface.gyp:surface', - '../webkit/support/webkit_support.gyp:glue_child', '../webkit/glue/webkit_glue_common.gyp:glue_common', '../webkit/renderer/webkit_renderer.gyp:webkit_renderer', '../webkit/support/webkit_support.gyp:glue', diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index c01b93a..20b8925 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -145,7 +145,7 @@ IPC_STRUCT_BEGIN(AutomationURLRequest) IPC_STRUCT_MEMBER(std::string, referrer) IPC_STRUCT_MEMBER(std::string, extra_request_headers) IPC_STRUCT_MEMBER(scoped_refptr<net::UploadData>, upload_data) - IPC_STRUCT_MEMBER(int, resource_type) // see webkit/common/resource_type.h + IPC_STRUCT_MEMBER(int, resource_type) // see webkit/glue/resource_type.h IPC_STRUCT_MEMBER(int, load_flags) // see net/base/load_flags.h IPC_STRUCT_END() diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index 41e8310..c8ec078 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+components/autofill/content/renderer", "+components/autofill/core/common", "+components/visitedlink/renderer", - "+content/public/child", "+content/public/renderer", "+extensions/common", "+grit", # For generated headers @@ -14,7 +13,6 @@ include_rules = [ "+sandbox/win/src", "+skia", - "+webkit/child", "+webkit/common", "+webkit/glue", "+webkit/glue/plugins", diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index f4a5f8b..e213149 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -33,7 +33,7 @@ #include "chrome/renderer/content_settings_observer.h" #include "chrome/renderer/extensions/extension_localization_peer.h" #include "chrome/renderer/security_filter_peer.h" -#include "content/public/child/resource_dispatcher_delegate.h" +#include "content/public/common/resource_dispatcher_delegate.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" @@ -41,6 +41,7 @@ #include "media/base/media_switches.h" #include "net/base/net_errors.h" #include "net/base/net_module.h" +#include "third_party/sqlite/sqlite3.h" #include "third_party/WebKit/public/web/WebCache.h" #include "third_party/WebKit/public/web/WebCrossOriginPreflightResultCache.h" #include "third_party/WebKit/public/web/WebDocument.h" @@ -49,7 +50,6 @@ #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" #include "third_party/WebKit/public/web/WebView.h" -#include "third_party/sqlite/sqlite3.h" #include "v8/include/v8.h" #if defined(OS_WIN) diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index fb8ddf8..b36149a 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -19,7 +19,7 @@ #include "third_party/WebKit/public/web/WebFrameClient.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebView.h" -#include "webkit/child/weburlresponse_extradata_impl.h" +#include "webkit/glue/weburlresponse_extradata_impl.h" using WebKit::WebDataSource; using WebKit::WebFrame; diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h index 3245d440..531fd6b 100644 --- a/chrome/renderer/extensions/extension_localization_peer.h +++ b/chrome/renderer/extensions/extension_localization_peer.h @@ -8,7 +8,7 @@ #include <string> #include "ipc/ipc_sender.h" -#include "webkit/child/resource_loader_bridge.h" +#include "webkit/glue/resource_loader_bridge.h" // The ExtensionLocalizationPeer is a proxy to a // webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc index f56f924..dd16705 100644 --- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc +++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc @@ -14,7 +14,7 @@ #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/child/resource_loader_bridge.h" +#include "webkit/glue/resource_loader_bridge.h" using testing::_; using testing::DoAll; diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h index ddc9e64..b4dd637 100644 --- a/chrome/renderer/security_filter_peer.h +++ b/chrome/renderer/security_filter_peer.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_SECURITY_FILTER_PEER_H_ #define CHROME_RENDERER_SECURITY_FILTER_PEER_H_ -#include "webkit/child/resource_loader_bridge.h" +#include "webkit/glue/resource_loader_bridge.h" // The SecurityFilterPeer is a proxy to a // webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process |