summaryrefslogtreecommitdiffstats
path: root/chrome/common/resource_dispatcher.cc
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-08 06:11:34 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-08 06:11:34 +0000
commit1a528c185cca100c4122b46d691adda44f774893 (patch)
tree584db92cde58bad5f41104a69d41d1e89b55b4d9 /chrome/common/resource_dispatcher.cc
parenta1481e294812aab9b6050db712669d2b75fea5a4 (diff)
downloadchromium_src-1a528c185cca100c4122b46d691adda44f774893.zip
chromium_src-1a528c185cca100c4122b46d691adda44f774893.tar.gz
chromium_src-1a528c185cca100c4122b46d691adda44f774893.tar.bz2
Revert 12739, 12740, and 12741 because we're going to fix Issue 7448 purely in WebKit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_dispatcher.cc')
-rw-r--r--chrome/common/resource_dispatcher.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index c5712ea..c669d43 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -51,7 +51,6 @@ 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,
@@ -106,7 +105,6 @@ 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,
@@ -125,7 +123,6 @@ 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;
@@ -529,7 +526,6 @@ 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,
@@ -539,7 +535,6 @@ 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,