Add the ability to specify a default MIME type when loading a resource. We'll need this to correctly load stylesheets that lack a Content-Type header in standards mode.

We're waiting on https://bugs.webkit.org/show_bug.cgi?id=24904 upstream before this works fully.  This change, as it stands, is a no-op.

R=wtc
BUG=7448

Review URL: http://codereview.chromium.org/55049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12739 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 0 deletions

diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 1af4ab1..08ace17 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -50,6 +50,7 @@ class IPCResourceLoaderBridge : public ResourceLoaderBridge {
                           const std::string& frame_origin,
                           const std::string& main_frame_origin,
                           const std::string& headers,
+                          const std::string& default_mime_type,
                           int load_flags,
                           int origin_pid,
                           ResourceType::Type resource_type,
@@ -103,6 +104,7 @@ IPCResourceLoaderBridge::IPCResourceLoaderBridge(
     const std::string& frame_origin,
     const std::string& main_frame_origin,
     const std::string& headers,
+    const std::string& default_mime_type,
     int load_flags,
     int origin_pid,
     ResourceType::Type resource_type,
@@ -120,6 +122,7 @@ IPCResourceLoaderBridge::IPCResourceLoaderBridge(
   request_.frame_origin = frame_origin;
   request_.main_frame_origin = main_frame_origin;
   request_.headers = headers;
+  request_.default_mime_type = default_mime_type;
   request_.load_flags = load_flags;
   request_.origin_pid = origin_pid;
   request_.resource_type = resource_type;
@@ -522,6 +525,7 @@ webkit_glue::ResourceLoaderBridge* ResourceDispatcher::CreateBridge(
     const std::string& frame_origin,
     const std::string& main_frame_origin,
     const std::string& headers,
+    const std::string& default_mime_type,
     int flags,
     int origin_pid,
     ResourceType::Type resource_type,
@@ -530,6 +534,7 @@ webkit_glue::ResourceLoaderBridge* ResourceDispatcher::CreateBridge(
   return new webkit_glue::IPCResourceLoaderBridge(this, method, url, policy_url,
                                                   referrer, frame_origin,
                                                   main_frame_origin, headers,
+                                                  default_mime_type,
                                                   flags, origin_pid,
                                                   resource_type,
                                                   request_context, route_id);