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

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

Issue 282103004: Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 6 years, 6 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
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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 // stores a reference so that we do not leak memory here. 915 // stores a reference so that we do not leak memory here.
916 otr_prefs_.reset(prefs_->CreateIncognitoPrefService( 916 otr_prefs_.reset(prefs_->CreateIncognitoPrefService(
917 new ExtensionPrefStore( 917 new ExtensionPrefStore(
918 ExtensionPrefValueMapFactory::GetForBrowserContext(this), true))); 918 ExtensionPrefValueMapFactory::GetForBrowserContext(this), true)));
919 } 919 }
920 return otr_prefs_.get(); 920 return otr_prefs_.get();
921 } 921 }
922 922
923 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext( 923 net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
924 content::ProtocolHandlerMap* protocol_handlers, 924 content::ProtocolHandlerMap* protocol_handlers,
925 content::ProtocolHandlerScopedVector protocol_interceptors) { 925 content::URLRequestInterceptorScopedVector request_interceptors) {
926 return io_data_.CreateMainRequestContextGetter( 926 return io_data_.CreateMainRequestContextGetter(
927 protocol_handlers, 927 protocol_handlers,
928 protocol_interceptors.Pass(), 928 request_interceptors.Pass(),
929 g_browser_process->local_state(), 929 g_browser_process->local_state(),
930 g_browser_process->io_thread()).get(); 930 g_browser_process->io_thread()).get();
931 } 931 }
932 932
933 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() { 933 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
934 return GetDefaultStoragePartition(this)->GetURLRequestContext(); 934 return GetDefaultStoragePartition(this)->GetURLRequestContext();
935 } 935 }
936 936
937 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess( 937 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess(
938 int renderer_child_id) { 938 int renderer_child_id) {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 1032
1033 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() { 1033 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
1034 return io_data_.GetExtensionsRequestContextGetter().get(); 1034 return io_data_.GetExtensionsRequestContextGetter().get();
1035 } 1035 }
1036 1036
1037 net::URLRequestContextGetter* 1037 net::URLRequestContextGetter*
1038 ProfileImpl::CreateRequestContextForStoragePartition( 1038 ProfileImpl::CreateRequestContextForStoragePartition(
1039 const base::FilePath& partition_path, 1039 const base::FilePath& partition_path,
1040 bool in_memory, 1040 bool in_memory,
1041 content::ProtocolHandlerMap* protocol_handlers, 1041 content::ProtocolHandlerMap* protocol_handlers,
1042 content::ProtocolHandlerScopedVector protocol_interceptors) { 1042 content::URLRequestInterceptorScopedVector request_interceptors) {
1043 return io_data_.CreateIsolatedAppRequestContextGetter( 1043 return io_data_.CreateIsolatedAppRequestContextGetter(
1044 partition_path, 1044 partition_path,
1045 in_memory, 1045 in_memory,
1046 protocol_handlers, 1046 protocol_handlers,
1047 protocol_interceptors.Pass()).get(); 1047 request_interceptors.Pass()).get();
1048 } 1048 }
1049 1049
1050 net::SSLConfigService* ProfileImpl::GetSSLConfigService() { 1050 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
1051 // If ssl_config_service_manager_ is null, this typically means that some 1051 // If ssl_config_service_manager_ is null, this typically means that some
1052 // KeyedService is trying to create a RequestContext at startup, 1052 // KeyedService is trying to create a RequestContext at startup,
1053 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is 1053 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is
1054 // invoked after all KeyedServices have been initialized (see 1054 // invoked after all KeyedServices have been initialized (see
1055 // http://crbug.com/171406). 1055 // http://crbug.com/171406).
1056 DCHECK(ssl_config_service_manager_) << 1056 DCHECK(ssl_config_service_manager_) <<
1057 "SSLConfigServiceManager is not initialized yet"; 1057 "SSLConfigServiceManager is not initialized yet";
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1356 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1357 #if defined(OS_CHROMEOS) 1357 #if defined(OS_CHROMEOS)
1358 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1358 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1359 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1359 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1360 g_browser_process->local_state()); 1360 g_browser_process->local_state());
1361 } 1361 }
1362 #endif // defined(OS_CHROMEOS) 1362 #endif // defined(OS_CHROMEOS)
1363 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1363 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1364 GetPrefs(), g_browser_process->local_state()); 1364 GetPrefs(), g_browser_process->local_state());
1365 } 1365 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698