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

Side by Side Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 2340133005: Merge M54: Support serving offline page by offline ID (Closed)
Patch Set: 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 (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 "chrome/browser/profiles/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_io_data.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 new net::FtpNetworkLayer(io_thread_globals->host_resolver.get())); 526 new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
527 #endif // !defined(DISABLE_FTP_SUPPORT) 527 #endif // !defined(DISABLE_FTP_SUPPORT)
528 528
529 std::unique_ptr<net::URLRequestJobFactoryImpl> main_job_factory( 529 std::unique_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
530 new net::URLRequestJobFactoryImpl()); 530 new net::URLRequestJobFactoryImpl());
531 InstallProtocolHandlers(main_job_factory.get(), protocol_handlers); 531 InstallProtocolHandlers(main_job_factory.get(), protocol_handlers);
532 532
533 // Install the Offline Page Interceptor. 533 // Install the Offline Page Interceptor.
534 #if defined(OS_ANDROID) 534 #if defined(OS_ANDROID)
535 request_interceptors.push_back(std::unique_ptr<net::URLRequestInterceptor>( 535 request_interceptors.push_back(std::unique_ptr<net::URLRequestInterceptor>(
536 new offline_pages::OfflinePageRequestInterceptor( 536 new offline_pages::OfflinePageRequestInterceptor()));
537 profile_params->profile)));
538 #endif 537 #endif
539 538
540 // The data reduction proxy interceptor should be as close to the network 539 // The data reduction proxy interceptor should be as close to the network
541 // as possible. 540 // as possible.
542 request_interceptors.insert( 541 request_interceptors.insert(
543 request_interceptors.begin(), 542 request_interceptors.begin(),
544 data_reduction_proxy_io_data()->CreateInterceptor().release()); 543 data_reduction_proxy_io_data()->CreateInterceptor().release());
545 main_job_factory_ = SetUpJobFactoryDefaults( 544 main_job_factory_ = SetUpJobFactoryDefaults(
546 std::move(main_job_factory), std::move(request_interceptors), 545 std::move(main_job_factory), std::move(request_interceptors),
547 std::move(profile_params->protocol_handler_interceptor), 546 std::move(profile_params->protocol_handler_interceptor),
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 const base::Closure& completion) { 791 const base::Closure& completion) {
793 DCHECK_CURRENTLY_ON(BrowserThread::IO); 792 DCHECK_CURRENTLY_ON(BrowserThread::IO);
794 DCHECK(initialized()); 793 DCHECK(initialized());
795 794
796 DCHECK(transport_security_state()); 795 DCHECK(transport_security_state());
797 // Completes synchronously. 796 // Completes synchronously.
798 transport_security_state()->DeleteAllDynamicDataSince(time); 797 transport_security_state()->DeleteAllDynamicDataSince(time);
799 DCHECK(http_server_properties_manager_); 798 DCHECK(http_server_properties_manager_);
800 http_server_properties_manager_->Clear(completion); 799 http_server_properties_manager_->Clear(completion);
801 } 800 }
OLDNEW
« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_tab_helper.cc ('k') | chrome/test/data/offline_pages/hello.mhtml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698