summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest.cc2
-rw-r--r--content/browser/child_process_security_policy_impl.h2
-rw-r--r--content/browser/loader/offline_policy_unittest.cc2
-rw-r--r--content/browser/loader/resource_dispatcher_host_impl.h2
-rw-r--r--content/browser/loader/resource_message_filter.h2
-rw-r--r--content/browser/loader/resource_request_info_impl.h2
-rw-r--r--content/browser/loader/resource_scheduler_unittest.cc2
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/browser/ssl/ssl_error_handler.h2
-rw-r--r--content/browser/ssl/ssl_policy.cc2
-rw-r--r--content/browser/ssl/ssl_policy.h2
-rw-r--r--content/browser/ssl/ssl_request_info.h2
-rw-r--r--content/browser/web_contents/web_contents_impl.h2
-rw-r--r--content/browser/worker_host/worker_process_host.cc2
14 files changed, 14 insertions, 14 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 8571a7c..6dbf2df 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -46,7 +46,7 @@
#include "third_party/WebKit/public/web/WebCursorInfo.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/surface/transport_dib.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
#if defined(OS_MACOSX)
#include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h"
diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h
index 713ef59..acf74cd 100644
--- a/content/browser/child_process_security_policy_impl.h
+++ b/content/browser/child_process_security_policy_impl.h
@@ -16,7 +16,7 @@
#include "base/synchronization/lock.h"
#include "content/public/browser/child_process_security_policy.h"
#include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
class GURL;
diff --git a/content/browser/loader/offline_policy_unittest.cc b/content/browser/loader/offline_policy_unittest.cc
index 40243c8..18c09df 100644
--- a/content/browser/loader/offline_policy_unittest.cc
+++ b/content/browser/loader/offline_policy_unittest.cc
@@ -9,7 +9,7 @@
#include "net/base/load_flags.h"
#include "net/http/http_response_info.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace content {
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index 71253fa..54e47e4 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -41,7 +41,7 @@
#include "ipc/ipc_message.h"
#include "net/cookies/canonical_cookie.h"
#include "net/url_request/url_request.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
class ResourceHandler;
struct ResourceHostMsg_Request;
diff --git a/content/browser/loader/resource_message_filter.h b/content/browser/loader/resource_message_filter.h
index 2c56af0..0ea5771 100644
--- a/content/browser/loader/resource_message_filter.h
+++ b/content/browser/loader/resource_message_filter.h
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/public/browser/browser_message_filter.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace fileapi {
class FileSystemContext;
diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h
index d9958653..1c663257 100644
--- a/content/browser/loader/resource_request_info_impl.h
+++ b/content/browser/loader/resource_request_info_impl.h
@@ -14,7 +14,7 @@
#include "content/public/browser/resource_request_info.h"
#include "content/public/common/referrer.h"
#include "net/base/load_states.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace webkit_blob {
class BlobData;
diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc
index 2066294..c28e2ff 100644
--- a/content/browser/loader/resource_scheduler_unittest.cc
+++ b/content/browser/loader/resource_scheduler_unittest.cc
@@ -21,7 +21,7 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace content {
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 157afe4..931e47d 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -130,7 +130,7 @@
#include "ui/base/ui_base_switches.h"
#include "ui/gl/gl_switches.h"
#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
#include "webkit/plugins/plugin_switches.h"
#if defined(OS_ANDROID)
diff --git a/content/browser/ssl/ssl_error_handler.h b/content/browser/ssl/ssl_error_handler.h
index 5f9e9e5..e7345e2 100644
--- a/content/browser/ssl/ssl_error_handler.h
+++ b/content/browser/ssl/ssl_error_handler.h
@@ -13,7 +13,7 @@
#include "content/common/content_export.h"
#include "content/public/browser/global_request_id.h"
#include "url/gurl.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace net {
class SSLInfo;
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 28c679b..5430070 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -21,7 +21,7 @@
#include "content/public/common/ssl_status.h"
#include "content/public/common/url_constants.h"
#include "net/ssl/ssl_info.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace {
diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h
index c88e10c..7d5d361 100644
--- a/content/browser/ssl/ssl_policy.h
+++ b/content/browser/ssl/ssl_policy.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/memory/ref_counted.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace content {
class NavigationEntryImpl;
diff --git a/content/browser/ssl/ssl_request_info.h b/content/browser/ssl/ssl_request_info.h
index cf745fe..7f27b4b 100644
--- a/content/browser/ssl/ssl_request_info.h
+++ b/content/browser/ssl/ssl_request_info.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "net/cert/cert_status_flags.h"
#include "url/gurl.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
namespace content {
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 81fbdf3..5486eba 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -31,7 +31,7 @@
#include "ui/gfx/rect_f.h"
#include "ui/gfx/size.h"
#include "ui/gfx/vector2d.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
struct BrowserPluginHostMsg_ResizeGuest_Params;
struct ViewHostMsg_DateTimeDialogValue_Params;
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 9f57bcc..b0e32c8 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -50,7 +50,7 @@
#include "ui/base/ui_base_switches.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
-#include "webkit/common/resource_type.h"
+#include "webkit/glue/resource_type.h"
#if defined(OS_WIN)
#include "content/common/sandbox_win.h"
generated by cgit v1.1 at 2025-02-06 20:17:12 +0000