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

Side by Side Diff: content/browser/storage_partition_impl_map.cc

Issue 625433002: Pages controlled by ServiceWorkers should not participate in AppCaching (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
« no previous file with comments | « content/browser/service_worker/service_worker_request_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/browser/storage_partition_impl_map.h" 5 #include "content/browser/storage_partition_impl_map.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/files/file_enumerator.h" 9 #include "base/files/file_enumerator.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/threading/sequenced_worker_pool.h" 16 #include "base/threading/sequenced_worker_pool.h"
17 #include "content/browser/appcache/appcache_interceptor.h"
17 #include "content/browser/appcache/chrome_appcache_service.h" 18 #include "content/browser/appcache/chrome_appcache_service.h"
18 #include "content/browser/fileapi/browser_file_system_helper.h" 19 #include "content/browser/fileapi/browser_file_system_helper.h"
19 #include "content/browser/fileapi/chrome_blob_storage_context.h" 20 #include "content/browser/fileapi/chrome_blob_storage_context.h"
20 #include "content/browser/loader/resource_request_info_impl.h" 21 #include "content/browser/loader/resource_request_info_impl.h"
21 #include "content/browser/resource_context_impl.h" 22 #include "content/browser/resource_context_impl.h"
22 #include "content/browser/service_worker/service_worker_request_handler.h" 23 #include "content/browser/service_worker/service_worker_request_handler.h"
23 #include "content/browser/storage_partition_impl.h" 24 #include "content/browser/storage_partition_impl.h"
24 #include "content/browser/streams/stream.h" 25 #include "content/browser/streams/stream.h"
25 #include "content/browser/streams/stream_context.h" 26 #include "content/browser/streams/stream_context.h"
26 #include "content/browser/streams/stream_registry.h" 27 #include "content/browser/streams/stream_registry.h"
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 } 431 }
431 protocol_handlers[kChromeDevToolsScheme] = 432 protocol_handlers[kChromeDevToolsScheme] =
432 linked_ptr<net::URLRequestJobFactory::ProtocolHandler>( 433 linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
433 CreateDevToolsProtocolHandler(browser_context_->GetResourceContext(), 434 CreateDevToolsProtocolHandler(browser_context_->GetResourceContext(),
434 browser_context_->IsOffTheRecord())); 435 browser_context_->IsOffTheRecord()));
435 436
436 URLRequestInterceptorScopedVector request_interceptors; 437 URLRequestInterceptorScopedVector request_interceptors;
437 request_interceptors.push_back( 438 request_interceptors.push_back(
438 ServiceWorkerRequestHandler::CreateInterceptor( 439 ServiceWorkerRequestHandler::CreateInterceptor(
439 browser_context_->GetResourceContext()).release()); 440 browser_context_->GetResourceContext()).release());
441 request_interceptors.push_back(
442 AppCacheInterceptor::CreateStartInterceptor().release());
440 443
441 // These calls must happen after StoragePartitionImpl::Create(). 444 // These calls must happen after StoragePartitionImpl::Create().
442 if (partition_domain.empty()) { 445 if (partition_domain.empty()) {
443 partition->SetURLRequestContext( 446 partition->SetURLRequestContext(
444 GetContentClient()->browser()->CreateRequestContext( 447 GetContentClient()->browser()->CreateRequestContext(
445 browser_context_, 448 browser_context_,
446 &protocol_handlers, 449 &protocol_handlers,
447 request_interceptors.Pass())); 450 request_interceptors.Pass()));
448 } else { 451 } else {
449 partition->SetURLRequestContext( 452 partition->SetURLRequestContext(
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 593
591 // We do not call InitializeURLRequestContext() for media contexts because, 594 // We do not call InitializeURLRequestContext() for media contexts because,
592 // other than the HTTP cache, the media contexts share the same backing 595 // other than the HTTP cache, the media contexts share the same backing
593 // objects as their associated "normal" request context. Thus, the previous 596 // objects as their associated "normal" request context. Thus, the previous
594 // call serves to initialize the media request context for this storage 597 // call serves to initialize the media request context for this storage
595 // partition as well. 598 // partition as well.
596 } 599 }
597 } 600 }
598 601
599 } // namespace content 602 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/service_worker_request_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698