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

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

Issue 12386009: Remove the chrome:// protocol interceptor since it's not used anymore now that the chrome job facto… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | 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 "chrome/browser/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 pref_file_path = pref_file_path.Append(chrome::kPreferencesFilename); 817 pref_file_path = pref_file_path.Append(chrome::kPreferencesFilename);
818 return pref_file_path; 818 return pref_file_path;
819 } 819 }
820 820
821 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext( 821 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
822 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 822 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
823 blob_protocol_handler, 823 blob_protocol_handler,
824 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 824 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
825 file_system_protocol_handler, 825 file_system_protocol_handler,
826 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 826 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
827 developer_protocol_handler,
828 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
829 chrome_protocol_handler, 827 chrome_protocol_handler,
830 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 828 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
831 chrome_devtools_protocol_handler) { 829 chrome_devtools_protocol_handler) {
832 return io_data_.CreateMainRequestContextGetter( 830 return io_data_.CreateMainRequestContextGetter(
833 blob_protocol_handler.Pass(), 831 blob_protocol_handler.Pass(),
834 file_system_protocol_handler.Pass(), 832 file_system_protocol_handler.Pass(),
835 developer_protocol_handler.Pass(),
836 chrome_protocol_handler.Pass(), 833 chrome_protocol_handler.Pass(),
837 chrome_devtools_protocol_handler.Pass(), 834 chrome_devtools_protocol_handler.Pass(),
838 g_browser_process->local_state(), 835 g_browser_process->local_state(),
839 g_browser_process->io_thread()); 836 g_browser_process->io_thread());
840 } 837 }
841 838
842 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() { 839 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
843 return GetDefaultStoragePartition(this)->GetURLRequestContext(); 840 return GetDefaultStoragePartition(this)->GetURLRequestContext();
844 } 841 }
845 842
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 881
885 net::URLRequestContextGetter* 882 net::URLRequestContextGetter*
886 ProfileImpl::CreateRequestContextForStoragePartition( 883 ProfileImpl::CreateRequestContextForStoragePartition(
887 const base::FilePath& partition_path, 884 const base::FilePath& partition_path,
888 bool in_memory, 885 bool in_memory,
889 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 886 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
890 blob_protocol_handler, 887 blob_protocol_handler,
891 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 888 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
892 file_system_protocol_handler, 889 file_system_protocol_handler,
893 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 890 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
894 developer_protocol_handler,
895 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
896 chrome_protocol_handler, 891 chrome_protocol_handler,
897 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler> 892 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
898 chrome_devtools_protocol_handler) { 893 chrome_devtools_protocol_handler) {
899 return io_data_.CreateIsolatedAppRequestContextGetter( 894 return io_data_.CreateIsolatedAppRequestContextGetter(
900 partition_path, in_memory, blob_protocol_handler.Pass(), 895 partition_path, in_memory, blob_protocol_handler.Pass(),
901 file_system_protocol_handler.Pass(), developer_protocol_handler.Pass(), 896 file_system_protocol_handler.Pass(), chrome_protocol_handler.Pass(),
902 chrome_protocol_handler.Pass(), chrome_devtools_protocol_handler.Pass()); 897 chrome_devtools_protocol_handler.Pass());
903 } 898 }
904 899
905 net::SSLConfigService* ProfileImpl::GetSSLConfigService() { 900 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
906 // If ssl_config_service_manager_ is null, this typically means that some 901 // If ssl_config_service_manager_ is null, this typically means that some
907 // ProfileKeyedService is trying to create a RequestContext at startup, but 902 // ProfileKeyedService is trying to create a RequestContext at startup, but
908 // SSLConfigServiceManager is not initialized until DoFinalInit() which is 903 // SSLConfigServiceManager is not initialized until DoFinalInit() which is
909 // invoked after all ProfileKeyedServices have been initialized (see 904 // invoked after all ProfileKeyedServices have been initialized (see
910 // http://crbug.com/171406). 905 // http://crbug.com/171406).
911 DCHECK(ssl_config_service_manager_.get()) << 906 DCHECK(ssl_config_service_manager_.get()) <<
912 "SSLConfigServiceManager is not initialized yet"; 907 "SSLConfigServiceManager is not initialized yet";
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
1184 base::FilePath* cache_path, 1179 base::FilePath* cache_path,
1185 int* max_size) { 1180 int* max_size) {
1186 DCHECK(cache_path); 1181 DCHECK(cache_path);
1187 DCHECK(max_size); 1182 DCHECK(max_size);
1188 base::FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir)); 1183 base::FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
1189 if (!path.empty()) 1184 if (!path.empty())
1190 *cache_path = path; 1185 *cache_path = path;
1191 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1186 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1192 prefs_->GetInteger(prefs::kDiskCacheSize); 1187 prefs_->GetInteger(prefs::kDiskCacheSize);
1193 } 1188 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698