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

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

Issue 2405483002: Make the request initiator Optional (Closed)
Patch Set: Rewrite using base::Optional Created 4 years, 2 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>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <utility> 13 #include <utility>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/bind.h" 16 #include "base/bind.h"
17 #include "base/files/file_path.h" 17 #include "base/files/file_path.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
20 #include "base/optional.h"
20 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
21 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
22 #include "base/strings/string_util.h" 23 #include "base/strings/string_util.h"
23 #include "base/time/time.h" 24 #include "base/time/time.h"
24 #include "build/build_config.h" 25 #include "build/build_config.h"
25 #include "components/mime_util/mime_util.h" 26 #include "components/mime_util/mime_util.h"
26 #include "content/child/child_thread_impl.h" 27 #include "content/child/child_thread_impl.h"
27 #include "content/child/ftp_directory_listing_response_delegate.h" 28 #include "content/child/ftp_directory_listing_response_delegate.h"
28 #include "content/child/request_extra_data.h" 29 #include "content/child/request_extra_data.h"
29 #include "content/child/resource_dispatcher.h" 30 #include "content/child/resource_dispatcher.h"
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 // creating the GURLs. 537 // creating the GURLs.
537 538
538 // TODO(horo): Check credentials flag is unset when credentials mode is omit. 539 // TODO(horo): Check credentials flag is unset when credentials mode is omit.
539 // Check credentials flag is set when credentials mode is include. 540 // Check credentials flag is set when credentials mode is include.
540 541
541 std::unique_ptr<ResourceRequest> resource_request(new ResourceRequest); 542 std::unique_ptr<ResourceRequest> resource_request(new ResourceRequest);
542 543
543 resource_request->method = method; 544 resource_request->method = method;
544 resource_request->url = url; 545 resource_request->url = url;
545 resource_request->first_party_for_cookies = request.firstPartyForCookies(); 546 resource_request->first_party_for_cookies = request.firstPartyForCookies();
546 resource_request->request_initiator = request.requestorOrigin(); 547 resource_request->request_initiator =
548 request.requestorOrigin().isNull()
549 ? base::Optional<url::Origin>()
550 : base::Optional<url::Origin>(request.requestorOrigin());
547 resource_request->referrer = referrer_url; 551 resource_request->referrer = referrer_url;
548 552
549 resource_request->referrer_policy = request.referrerPolicy(); 553 resource_request->referrer_policy = request.referrerPolicy();
550 554
551 resource_request->headers = GetWebURLRequestHeaders(request); 555 resource_request->headers = GetWebURLRequestHeaders(request);
552 resource_request->load_flags = GetLoadFlagsForWebURLRequest(request); 556 resource_request->load_flags = GetLoadFlagsForWebURLRequest(request);
553 // origin_pid only needs to be non-zero if the request originates outside 557 // origin_pid only needs to be non-zero if the request originates outside
554 // the render process, so we can use requestorProcessID even for requests 558 // the render process, so we can use requestorProcessID even for requests
555 // from in-process plugins. 559 // from in-process plugins.
556 resource_request->origin_pid = request.requestorProcessID(); 560 resource_request->origin_pid = request.requestorProcessID();
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 int intra_priority_value) { 1238 int intra_priority_value) {
1235 context_->DidChangePriority(new_priority, intra_priority_value); 1239 context_->DidChangePriority(new_priority, intra_priority_value);
1236 } 1240 }
1237 1241
1238 void WebURLLoaderImpl::setLoadingTaskRunner( 1242 void WebURLLoaderImpl::setLoadingTaskRunner(
1239 blink::WebTaskRunner* loading_task_runner) { 1243 blink::WebTaskRunner* loading_task_runner) {
1240 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner()); 1244 context_->SetTaskRunner(loading_task_runner->toSingleThreadTaskRunner());
1241 } 1245 }
1242 1246
1243 } // namespace content 1247 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698