OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 | 162 |
163 params->ssl_config_service = profile->GetSSLConfigService(); | 163 params->ssl_config_service = profile->GetSSLConfigService(); |
164 params->cookie_monster_delegate = new ChromeCookieMonsterDelegate(profile); | 164 params->cookie_monster_delegate = new ChromeCookieMonsterDelegate(profile); |
165 params->database_tracker = profile->GetDatabaseTracker(); | 165 params->database_tracker = profile->GetDatabaseTracker(); |
166 params->appcache_service = profile->GetAppCacheService(); | 166 params->appcache_service = profile->GetAppCacheService(); |
167 params->blob_storage_context = profile->GetBlobStorageContext(); | 167 params->blob_storage_context = profile->GetBlobStorageContext(); |
168 params->file_system_context = profile->GetFileSystemContext(); | 168 params->file_system_context = profile->GetFileSystemContext(); |
169 params->extension_info_map = profile->GetExtensionInfoMap(); | 169 params->extension_info_map = profile->GetExtensionInfoMap(); |
170 params->extension_io_event_router = profile->GetExtensionIOEventRouter(); | 170 params->extension_io_event_router = profile->GetExtensionIOEventRouter(); |
171 params->prerender_manager = profile->GetPrerenderManager(); | 171 params->prerender_manager = profile->GetPrerenderManager(); |
172 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); | |
172 | 173 |
173 params->proxy_config_service.reset(CreateProxyConfigService(profile)); | 174 params->proxy_config_service.reset(CreateProxyConfigService(profile)); |
174 } | 175 } |
175 | 176 |
176 ProfileIOData::RequestContext::RequestContext() {} | 177 ProfileIOData::RequestContext::RequestContext() {} |
177 ProfileIOData::RequestContext::~RequestContext() {} | 178 ProfileIOData::RequestContext::~RequestContext() {} |
178 | 179 |
179 ProfileIOData::ProfileParams::ProfileParams() | 180 ProfileIOData::ProfileParams::ProfileParams() |
180 : is_off_the_record(false), | 181 : is_off_the_record(false), |
181 clear_local_state_on_exit(false) {} | 182 clear_local_state_on_exit(false) {} |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
248 profile_params.transport_security_state); | 249 profile_params.transport_security_state); |
249 context->set_ssl_config_service(profile_params.ssl_config_service); | 250 context->set_ssl_config_service(profile_params.ssl_config_service); |
250 context->set_database_tracker(profile_params.database_tracker); | 251 context->set_database_tracker(profile_params.database_tracker); |
251 context->set_appcache_service(profile_params.appcache_service); | 252 context->set_appcache_service(profile_params.appcache_service); |
252 context->set_blob_storage_context(profile_params.blob_storage_context); | 253 context->set_blob_storage_context(profile_params.blob_storage_context); |
253 context->set_file_system_context(profile_params.file_system_context); | 254 context->set_file_system_context(profile_params.file_system_context); |
254 context->set_extension_info_map(profile_params.extension_info_map); | 255 context->set_extension_info_map(profile_params.extension_info_map); |
255 context->set_extension_io_event_router( | 256 context->set_extension_io_event_router( |
256 profile_params.extension_io_event_router); | 257 profile_params.extension_io_event_router); |
257 context->set_prerender_manager(profile_params.prerender_manager); | 258 context->set_prerender_manager(profile_params.prerender_manager); |
259 context->set_protocol_handler_registry(profile_params.protocol_handler_registr y); | |
tony
2011/02/22 17:52:08
Nit: 80 cols
| |
258 } | 260 } |
259 | 261 |
260 // static | 262 // static |
261 net::ProxyConfigService* ProfileIOData::CreateProxyConfigService( | 263 net::ProxyConfigService* ProfileIOData::CreateProxyConfigService( |
262 Profile* profile) { | 264 Profile* profile) { |
263 // The linux gconf-based proxy settings getter relies on being initialized | 265 // The linux gconf-based proxy settings getter relies on being initialized |
264 // from the UI thread. | 266 // from the UI thread. |
265 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 267 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
266 | 268 |
267 // Create a baseline service that provides proxy configuration in case nothing | 269 // Create a baseline service that provides proxy configuration in case nothing |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
334 | 336 |
335 #if defined(OS_CHROMEOS) | 337 #if defined(OS_CHROMEOS) |
336 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { | 338 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { |
337 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> | 339 chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()-> |
338 RegisterNetworkProxyHandler(proxy_service); | 340 RegisterNetworkProxyHandler(proxy_service); |
339 } | 341 } |
340 #endif // defined(OS_CHROMEOS) | 342 #endif // defined(OS_CHROMEOS) |
341 | 343 |
342 return proxy_service; | 344 return proxy_service; |
343 } | 345 } |
OLD | NEW |