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

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

Issue 2714423002: Rename SkipServiceWorker to ServiceWorkerMode (Closed)
Patch Set: typos-- Created 3 years, 9 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_fetch_dispatcher.h" 5 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 ? original_request->initiator() 550 ? original_request->initiator()
551 : url::Origin(original_request->url()); 551 : url::Origin(original_request->url());
552 request.referrer = GURL(original_request->referrer()); 552 request.referrer = GURL(original_request->referrer());
553 request.referrer_policy = original_info->GetReferrerPolicy(); 553 request.referrer_policy = original_info->GetReferrerPolicy();
554 request.visibility_state = original_info->GetVisibilityState(); 554 request.visibility_state = original_info->GetVisibilityState();
555 request.load_flags = original_request->load_flags(); 555 request.load_flags = original_request->load_flags();
556 // Set to SUB_RESOURCE because we shouldn't trigger NavigationResourceThrottle 556 // Set to SUB_RESOURCE because we shouldn't trigger NavigationResourceThrottle
557 // for the service worker navigation preload request. 557 // for the service worker navigation preload request.
558 request.resource_type = RESOURCE_TYPE_SUB_RESOURCE; 558 request.resource_type = RESOURCE_TYPE_SUB_RESOURCE;
559 request.priority = original_request->priority(); 559 request.priority = original_request->priority();
560 request.skip_service_worker = SkipServiceWorker::ALL; 560 request.service_worker_mode = ServiceWorkerMode::NONE;
561 request.do_not_prompt_for_login = true; 561 request.do_not_prompt_for_login = true;
562 request.render_frame_id = original_info->GetRenderFrameID(); 562 request.render_frame_id = original_info->GetRenderFrameID();
563 request.is_main_frame = original_info->IsMainFrame(); 563 request.is_main_frame = original_info->IsMainFrame();
564 request.parent_is_main_frame = original_info->ParentIsMainFrame(); 564 request.parent_is_main_frame = original_info->ParentIsMainFrame();
565 request.enable_load_timing = original_info->is_load_timing_enabled(); 565 request.enable_load_timing = original_info->is_load_timing_enabled();
566 request.report_raw_headers = original_info->ShouldReportRawHeaders(); 566 request.report_raw_headers = original_info->ShouldReportRawHeaders();
567 567
568 DCHECK(net::HttpUtil::IsValidHeaderValue( 568 DCHECK(net::HttpUtil::IsValidHeaderValue(
569 version_->navigation_preload_state().header)); 569 version_->navigation_preload_state().header));
570 ServiceWorkerMetrics::RecordNavigationPreloadRequestHeaderSize( 570 ServiceWorkerMetrics::RecordNavigationPreloadRequestHeaderSize(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 ServiceWorkerVersion* version, 613 ServiceWorkerVersion* version,
614 int event_finish_id, 614 int event_finish_id,
615 scoped_refptr<URLLoaderAssets> url_loader_assets, 615 scoped_refptr<URLLoaderAssets> url_loader_assets,
616 ServiceWorkerStatusCode status, 616 ServiceWorkerStatusCode status,
617 base::Time dispatch_event_time) { 617 base::Time dispatch_event_time) {
618 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT, 618 version->FinishRequest(event_finish_id, status != SERVICE_WORKER_ERROR_ABORT,
619 dispatch_event_time); 619 dispatch_event_time);
620 } 620 }
621 621
622 } // namespace content 622 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/foreign_fetch_request_handler_unittest.cc ('k') | content/child/web_url_loader_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698