Content-Dispositon handling fix #2. Still WiP. Uploading as a check point....

chrome/common/resource_dispatcher.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "chrome/common/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 38 matching lines @@
                           const GURL& policy_url,
                           const GURL& referrer,
                           const std::string& frame_origin,
                           const std::string& main_frame_origin,
                           const std::string& headers,
                           int load_flags,
                           int origin_pid,
                           ResourceType::Type resource_type,
                           uint32 request_context,
                           int app_cache_context_id,
-                          int route_id);
+                          int route_id,
+                          const std::string& disposition_fallback_charset);
   virtual ~IPCResourceLoaderBridge();
 
   // ResourceLoaderBridge
   virtual void AppendDataToUpload(const char* data, int data_len);
   virtual void AppendFileRangeToUpload(const FilePath& path,
                                        uint64 offset, uint64 length);
   virtual void SetUploadIdentifier(int64 identifier);
   virtual bool Start(Peer* peer);
   virtual void Cancel();
   virtual void SetDefersLoading(bool value);
@@ skipping 33 matching lines @@
     const GURL& policy_url,
     const GURL& referrer,
     const std::string& frame_origin,
     const std::string& main_frame_origin,
     const std::string& headers,
     int load_flags,
     int origin_pid,
     ResourceType::Type resource_type,
     uint32 request_context,
     int app_cache_context_id,
-    int route_id)
+    int route_id,
+    const std::string& disposition_fallback_charset)
     : peer_(NULL),
       dispatcher_(dispatcher),
       request_id_(-1),
       route_id_(route_id) {
   DCHECK(dispatcher_) << "no resource dispatcher";
   request_.method = method;
   request_.url = url;
   request_.policy_url = policy_url;
   request_.referrer = referrer;
   request_.frame_origin = frame_origin;
   request_.main_frame_origin = main_frame_origin;
   request_.headers = headers;
   request_.load_flags = load_flags;
   request_.origin_pid = origin_pid;
   request_.resource_type = resource_type;
   request_.request_context = request_context;
   request_.app_cache_context_id = app_cache_context_id;
+  request_.disposition_fallback_charset = disposition_fallback_charset;
 
 #ifdef LOG_RESOURCE_REQUESTS
   url_ = url.possibly_invalid_spec();
 #endif
 }
 
 IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
   // we remove our hook for the resource dispatcher only when going away, since
   // it doesn't keep track of whether we've force terminated the request
   if (request_id_ >= 0) {
@@ skipping 383 matching lines @@
     const GURL& policy_url,
     const GURL& referrer,
     const std::string& frame_origin,
     const std::string& main_frame_origin,
     const std::string& headers,
     int flags,
     int origin_pid,
     ResourceType::Type resource_type,
     uint32 request_context,
     int app_cache_context_id,
-    int route_id) {
+    int route_id,
+    const std::string& disposition_fallback_charset) {
   return new webkit_glue::IPCResourceLoaderBridge(this, method, url, policy_url,
                                                   referrer, frame_origin,
                                                   main_frame_origin, headers,
                                                   flags, origin_pid,
                                                   resource_type,
                                                   request_context,
                                                   app_cache_context_id,
-                                                  route_id);
+                                                  route_id,
+                                                  disposition_fallback_charset);
 }
 
 bool ResourceDispatcher::IsResourceDispatcherMessage(
     const IPC::Message& message) {
   switch (message.type()) {
     case ViewMsg_Resource_DownloadProgress::ID:
     case ViewMsg_Resource_UploadProgress::ID:
     case ViewMsg_Resource_ReceivedResponse::ID:
     case ViewMsg_Resource_ReceivedRedirect::ID:
     case ViewMsg_Resource_DataReceived::ID:
     case ViewMsg_Resource_RequestComplete::ID:
       return true;
 
     default:
       break;
   }
 
   return false;
 }