Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 11439008: net: Change argument of URLRequest::set_upload from UploadData to UploadDataStream (Closed) Base URL: http://git.chromium.org/chromium/src.git@chunk
Patch Set: Fix android Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/loader/resource_dispatcher_host_impl.h" 7 #include "content/browser/loader/resource_dispatcher_host_impl.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "content/public/common/process_type.h" 59 #include "content/public/common/process_type.h"
60 #include "content/public/common/url_constants.h" 60 #include "content/public/common/url_constants.h"
61 #include "net/base/auth.h" 61 #include "net/base/auth.h"
62 #include "net/base/cert_status_flags.h" 62 #include "net/base/cert_status_flags.h"
63 #include "net/base/load_flags.h" 63 #include "net/base/load_flags.h"
64 #include "net/base/mime_util.h" 64 #include "net/base/mime_util.h"
65 #include "net/base/net_errors.h" 65 #include "net/base/net_errors.h"
66 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 66 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
67 #include "net/base/request_priority.h" 67 #include "net/base/request_priority.h"
68 #include "net/base/ssl_cert_request_info.h" 68 #include "net/base/ssl_cert_request_info.h"
69 #include "net/base/upload_data.h" 69 #include "net/base/upload_data_stream.h"
70 #include "net/cookies/cookie_monster.h" 70 #include "net/cookies/cookie_monster.h"
71 #include "net/http/http_cache.h" 71 #include "net/http/http_cache.h"
72 #include "net/http/http_response_headers.h" 72 #include "net/http/http_response_headers.h"
73 #include "net/http/http_response_info.h" 73 #include "net/http/http_response_info.h"
74 #include "net/http/http_transaction_factory.h" 74 #include "net/http/http_transaction_factory.h"
75 #include "net/url_request/url_request.h" 75 #include "net/url_request/url_request.h"
76 #include "net/url_request/url_request_context.h" 76 #include "net/url_request/url_request_context.h"
77 #include "net/url_request/url_request_job_factory.h" 77 #include "net/url_request/url_request_job_factory.h"
78 #include "webkit/appcache/appcache_interceptor.h" 78 #include "webkit/appcache/appcache_interceptor.h"
79 #include "webkit/appcache/appcache_interfaces.h" 79 #include "webkit/appcache/appcache_interfaces.h"
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 946
947 // TODO(darin): Do we really need all of these URLRequest setters in the 947 // TODO(darin): Do we really need all of these URLRequest setters in the
948 // transferred navigation case? 948 // transferred navigation case?
949 949
950 request->set_load_flags(load_flags); 950 request->set_load_flags(load_flags);
951 951
952 request->set_priority(DetermineRequestPriority(request_data.resource_type)); 952 request->set_priority(DetermineRequestPriority(request_data.resource_type));
953 953
954 // Resolve elements from request_body and prepare upload data. 954 // Resolve elements from request_body and prepare upload data.
955 if (request_data.request_body) { 955 if (request_data.request_body) {
956 request->set_upload( 956 request->set_upload(make_scoped_ptr(
957 request_data.request_body->ResolveElementsAndCreateUploadData( 957 request_data.request_body->ResolveElementsAndCreateUploadDataStream(
958 filter_->blob_storage_context()->controller())); 958 filter_->blob_storage_context()->controller())));
959 } 959 }
960 960
961 bool allow_download = request_data.allow_download && 961 bool allow_download = request_data.allow_download &&
962 ResourceType::IsFrame(request_data.resource_type); 962 ResourceType::IsFrame(request_data.resource_type);
963 963
964 // Make extra info and read footer (contains request ID). 964 // Make extra info and read footer (contains request ID).
965 ResourceRequestInfoImpl* extra_info = 965 ResourceRequestInfoImpl* extra_info =
966 new ResourceRequestInfoImpl( 966 new ResourceRequestInfoImpl(
967 process_type, 967 process_type,
968 child_id, 968 child_id,
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
1720 1720
1721 return i->second.get(); 1721 return i->second.get();
1722 } 1722 }
1723 1723
1724 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, 1724 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
1725 int request_id) const { 1725 int request_id) const {
1726 return GetLoader(GlobalRequestID(child_id, request_id)); 1726 return GetLoader(GlobalRequestID(child_id, request_id));
1727 } 1727 }
1728 1728
1729 } // namespace content 1729 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/download/download_manager_impl.cc ('k') | content/browser/loader/resource_dispatcher_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698