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

Side by Side Diff: content/child/web_url_loader_impl.cc

Issue 2355023002: Preserving Content-Type header from http request in OpenURL path. (Closed)
Patch Set: Rebasing... Created 4 years, 3 months 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/child/web_url_loader_impl.h" 5 #include "content/child/web_url_loader_impl.h"
6 6
7 #include <openssl/ssl.h> 7 #include <openssl/ssl.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 525
526 resource_request->method = method; 526 resource_request->method = method;
527 resource_request->url = url; 527 resource_request->url = url;
528 resource_request->first_party_for_cookies = request.firstPartyForCookies(); 528 resource_request->first_party_for_cookies = request.firstPartyForCookies();
529 resource_request->request_initiator = request.requestorOrigin(); 529 resource_request->request_initiator = request.requestorOrigin();
530 resource_request->referrer = referrer_url; 530 resource_request->referrer = referrer_url;
531 531
532 referrer_policy_ = request.referrerPolicy(); 532 referrer_policy_ = request.referrerPolicy();
533 resource_request->referrer_policy = referrer_policy_; 533 resource_request->referrer_policy = referrer_policy_;
534 534
535 resource_request->headers = GetWebURLRequestHeaders(request); 535 resource_request->headers =
536 GetWebURLRequestHeadersForResourceRequest(request);
536 resource_request->load_flags = GetLoadFlagsForWebURLRequest(request); 537 resource_request->load_flags = GetLoadFlagsForWebURLRequest(request);
537 // origin_pid only needs to be non-zero if the request originates outside 538 // origin_pid only needs to be non-zero if the request originates outside
538 // the render process, so we can use requestorProcessID even for requests 539 // the render process, so we can use requestorProcessID even for requests
539 // from in-process plugins. 540 // from in-process plugins.
540 resource_request->origin_pid = request.requestorProcessID(); 541 resource_request->origin_pid = request.requestorProcessID();
541 resource_request->resource_type = WebURLRequestToResourceType(request); 542 resource_request->resource_type = WebURLRequestToResourceType(request);
542 resource_request->priority = 543 resource_request->priority =
543 ConvertWebKitPriorityToNetPriority(request.getPriority()); 544 ConvertWebKitPriorityToNetPriority(request.getPriority());
544 resource_request->appcache_host_id = request.appCacheHostID(); 545 resource_request->appcache_host_id = request.appCacheHostID();
545 resource_request->should_reset_appcache = request.shouldResetAppCache(); 546 resource_request->should_reset_appcache = request.shouldResetAppCache();
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 response->clearHTTPHeaderField(webStringName); 1252 response->clearHTTPHeaderField(webStringName);
1252 while (response_headers->EnumerateHeader(&iterator, name, &value)) { 1253 while (response_headers->EnumerateHeader(&iterator, name, &value)) {
1253 response->addHTTPHeaderField(webStringName, 1254 response->addHTTPHeaderField(webStringName,
1254 WebString::fromLatin1(value)); 1255 WebString::fromLatin1(value));
1255 } 1256 }
1256 } 1257 }
1257 return true; 1258 return true;
1258 } 1259 }
1259 1260
1260 } // namespace content 1261 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698