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

Side by Side Diff: content/browser/service_worker/service_worker_url_request_job.cc

Issue 615493003: [ServiceWorker] Plumbing the request credentials mode to the ServiceWorker. [2/2 chromium] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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/browser/service_worker/service_worker_url_request_job.h" 5 #include "content/browser/service_worker/service_worker_url_request_job.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 18 matching lines...) Expand all
29 #include "ui/base/page_transition_types.h" 29 #include "ui/base/page_transition_types.h"
30 30
31 namespace content { 31 namespace content {
32 32
33 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob( 33 ServiceWorkerURLRequestJob::ServiceWorkerURLRequestJob(
34 net::URLRequest* request, 34 net::URLRequest* request,
35 net::NetworkDelegate* network_delegate, 35 net::NetworkDelegate* network_delegate,
36 base::WeakPtr<ServiceWorkerProviderHost> provider_host, 36 base::WeakPtr<ServiceWorkerProviderHost> provider_host,
37 base::WeakPtr<storage::BlobStorageContext> blob_storage_context, 37 base::WeakPtr<storage::BlobStorageContext> blob_storage_context,
38 FetchRequestMode request_mode, 38 FetchRequestMode request_mode,
39 FetchCredentialsMode credentials_mode,
39 scoped_refptr<ResourceRequestBody> body) 40 scoped_refptr<ResourceRequestBody> body)
40 : net::URLRequestJob(request, network_delegate), 41 : net::URLRequestJob(request, network_delegate),
41 provider_host_(provider_host), 42 provider_host_(provider_host),
42 response_type_(NOT_DETERMINED), 43 response_type_(NOT_DETERMINED),
43 is_started_(false), 44 is_started_(false),
44 blob_storage_context_(blob_storage_context), 45 blob_storage_context_(blob_storage_context),
45 request_mode_(request_mode), 46 request_mode_(request_mode),
47 credentials_mode_(credentials_mode),
46 fall_back_required_(false), 48 fall_back_required_(false),
47 body_(body), 49 body_(body),
48 weak_factory_(this) { 50 weak_factory_(this) {
49 } 51 }
50 52
51 void ServiceWorkerURLRequestJob::FallbackToNetwork() { 53 void ServiceWorkerURLRequestJob::FallbackToNetwork() {
52 DCHECK_EQ(NOT_DETERMINED, response_type_); 54 DCHECK_EQ(NOT_DETERMINED, response_type_);
53 response_type_ = FALLBACK_TO_NETWORK; 55 response_type_ = FALLBACK_TO_NETWORK;
54 MaybeStartRequest(); 56 MaybeStartRequest();
55 } 57 }
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 new ServiceWorkerFetchRequest()); 274 new ServiceWorkerFetchRequest());
273 request->mode = request_mode_; 275 request->mode = request_mode_;
274 request->url = request_->url(); 276 request->url = request_->url();
275 request->method = request_->method(); 277 request->method = request_->method();
276 const net::HttpRequestHeaders& headers = request_->extra_request_headers(); 278 const net::HttpRequestHeaders& headers = request_->extra_request_headers();
277 for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();) 279 for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext();)
278 request->headers[it.name()] = it.value(); 280 request->headers[it.name()] = it.value();
279 request->blob_uuid = blob_uuid; 281 request->blob_uuid = blob_uuid;
280 request->blob_size = blob_size; 282 request->blob_size = blob_size;
281 request->referrer = GURL(request_->referrer()); 283 request->referrer = GURL(request_->referrer());
284 request->credentials_mode = credentials_mode_;
282 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_); 285 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);
283 if (info) { 286 if (info) {
284 request->is_reload = ui::PageTransitionCoreTypeIs( 287 request->is_reload = ui::PageTransitionCoreTypeIs(
285 info->GetPageTransition(), ui::PAGE_TRANSITION_RELOAD); 288 info->GetPageTransition(), ui::PAGE_TRANSITION_RELOAD);
286 } 289 }
287 return request.Pass(); 290 return request.Pass();
288 } 291 }
289 292
290 bool ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid, 293 bool ServiceWorkerURLRequestJob::CreateRequestBodyBlob(std::string* blob_uuid,
291 uint64* blob_size) { 294 uint64* blob_size) {
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 464
462 void ServiceWorkerURLRequestJob::DeliverErrorResponse() { 465 void ServiceWorkerURLRequestJob::DeliverErrorResponse() {
463 // TODO(falken): Print an error to the console of the ServiceWorker and of 466 // TODO(falken): Print an error to the console of the ServiceWorker and of
464 // the requesting page. 467 // the requesting page.
465 CreateResponseHeader( 468 CreateResponseHeader(
466 500, "Service Worker Response Error", ServiceWorkerHeaderMap()); 469 500, "Service Worker Response Error", ServiceWorkerHeaderMap());
467 CommitResponseHeader(); 470 CommitResponseHeader();
468 } 471 }
469 472
470 } // namespace content 473 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698