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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
36 #include "chrome/browser/profiles/profile_manager.h" | 36 #include "chrome/browser/profiles/profile_manager.h" |
37 #include "chrome/browser/transport_security_persister.h" | 37 #include "chrome/browser/transport_security_persister.h" |
38 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" | 38 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" |
39 #include "chrome/common/chrome_notification_types.h" | 39 #include "chrome/common/chrome_notification_types.h" |
40 #include "chrome/common/chrome_switches.h" | 40 #include "chrome/common/chrome_switches.h" |
41 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
42 #include "chrome/common/url_constants.h" | 42 #include "chrome/common/url_constants.h" |
43 #include "content/browser/appcache/chrome_appcache_service.h" | 43 #include "content/browser/appcache/chrome_appcache_service.h" |
44 #include "content/browser/chrome_blob_storage_context.h" | 44 #include "content/browser/chrome_blob_storage_context.h" |
| 45 #include "content/browser/in_process_webkit/webkit_context.h" |
45 #include "content/browser/renderer_host/media/media_stream_manager.h" | 46 #include "content/browser/renderer_host/media/media_stream_manager.h" |
46 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 47 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
47 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 48 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
48 #include "content/browser/resource_context.h" | 49 #include "content/browser/resource_context.h" |
49 #include "content/public/browser/browser_thread.h" | 50 #include "content/public/browser/browser_thread.h" |
50 #include "content/public/browser/host_zoom_map.h" | 51 #include "content/public/browser/host_zoom_map.h" |
51 #include "content/public/browser/notification_service.h" | 52 #include "content/public/browser/notification_service.h" |
52 #include "media/audio/audio_manager.h" | 53 #include "media/audio/audio_manager.h" |
53 #include "net/base/origin_bound_cert_service.h" | 54 #include "net/base/origin_bound_cert_service.h" |
54 #include "net/http/http_transaction_factory.h" | 55 #include "net/http/http_transaction_factory.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 params->ssl_config_service = profile->GetSSLConfigService(); | 228 params->ssl_config_service = profile->GetSSLConfigService(); |
228 base::Callback<Profile*(void)> profile_getter = | 229 base::Callback<Profile*(void)> profile_getter = |
229 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), | 230 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), |
230 profile); | 231 profile); |
231 params->cookie_monster_delegate = | 232 params->cookie_monster_delegate = |
232 new ChromeCookieMonsterDelegate(profile_getter); | 233 new ChromeCookieMonsterDelegate(profile_getter); |
233 params->database_tracker = profile->GetDatabaseTracker(); | 234 params->database_tracker = profile->GetDatabaseTracker(); |
234 params->appcache_service = profile->GetAppCacheService(); | 235 params->appcache_service = profile->GetAppCacheService(); |
235 params->blob_storage_context = profile->GetBlobStorageContext(); | 236 params->blob_storage_context = profile->GetBlobStorageContext(); |
236 params->file_system_context = profile->GetFileSystemContext(); | 237 params->file_system_context = profile->GetFileSystemContext(); |
| 238 params->webkit_context = profile->GetWebKitContext(); |
237 params->quota_manager = profile->GetQuotaManager(); | 239 params->quota_manager = profile->GetQuotaManager(); |
238 params->extension_info_map = profile->GetExtensionInfoMap(); | 240 params->extension_info_map = profile->GetExtensionInfoMap(); |
239 params->notification_service = | 241 params->notification_service = |
240 DesktopNotificationServiceFactory::GetForProfile(profile); | 242 DesktopNotificationServiceFactory::GetForProfile(profile); |
241 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); | 243 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); |
242 | 244 |
243 ChromeProxyConfigService* proxy_config_service = | 245 ChromeProxyConfigService* proxy_config_service = |
244 ProxyServiceFactory::CreateProxyConfigService(true); | 246 ProxyServiceFactory::CreateProxyConfigService(true); |
245 params->proxy_config_service.reset(proxy_config_service); | 247 params->proxy_config_service.reset(proxy_config_service); |
246 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( | 248 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 #endif // defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD) | 493 #endif // defined(OS_CHROMEOS) && !defined(GOOGLE_CHROME_BUILD) |
492 | 494 |
493 media_stream_manager_.reset( | 495 media_stream_manager_.reset( |
494 new media_stream::MediaStreamManager(profile_params_->audio_manager)); | 496 new media_stream::MediaStreamManager(profile_params_->audio_manager)); |
495 | 497 |
496 // Take ownership over these parameters. | 498 // Take ownership over these parameters. |
497 database_tracker_ = profile_params_->database_tracker; | 499 database_tracker_ = profile_params_->database_tracker; |
498 appcache_service_ = profile_params_->appcache_service; | 500 appcache_service_ = profile_params_->appcache_service; |
499 blob_storage_context_ = profile_params_->blob_storage_context; | 501 blob_storage_context_ = profile_params_->blob_storage_context; |
500 file_system_context_ = profile_params_->file_system_context; | 502 file_system_context_ = profile_params_->file_system_context; |
| 503 webkit_context_ = profile_params_->webkit_context; |
501 quota_manager_ = profile_params_->quota_manager; | 504 quota_manager_ = profile_params_->quota_manager; |
502 host_zoom_map_ = profile_params_->host_zoom_map; | 505 host_zoom_map_ = profile_params_->host_zoom_map; |
503 host_content_settings_map_ = profile_params_->host_content_settings_map; | 506 host_content_settings_map_ = profile_params_->host_content_settings_map; |
504 cookie_settings_ = profile_params_->cookie_settings; | 507 cookie_settings_ = profile_params_->cookie_settings; |
505 notification_service_ = profile_params_->notification_service; | 508 notification_service_ = profile_params_->notification_service; |
506 extension_info_map_ = profile_params_->extension_info_map; | 509 extension_info_map_ = profile_params_->extension_info_map; |
507 | 510 |
508 resource_context_.set_host_resolver(io_thread_globals->host_resolver.get()); | 511 resource_context_.set_host_resolver(io_thread_globals->host_resolver.get()); |
509 resource_context_.set_request_context(main_request_context_); | 512 resource_context_.set_request_context(main_request_context_); |
510 resource_context_.set_database_tracker(database_tracker_); | 513 resource_context_.set_database_tracker(database_tracker_); |
511 resource_context_.set_appcache_service(appcache_service_); | 514 resource_context_.set_appcache_service(appcache_service_); |
512 resource_context_.set_blob_storage_context(blob_storage_context_); | 515 resource_context_.set_blob_storage_context(blob_storage_context_); |
513 resource_context_.set_file_system_context(file_system_context_); | 516 resource_context_.set_file_system_context(file_system_context_); |
| 517 resource_context_.set_webkit_context(webkit_context_); |
514 resource_context_.set_quota_manager(quota_manager_); | 518 resource_context_.set_quota_manager(quota_manager_); |
515 resource_context_.set_host_zoom_map(host_zoom_map_); | 519 resource_context_.set_host_zoom_map(host_zoom_map_); |
516 resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this)); | 520 resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this)); |
517 resource_context_.set_media_observer( | 521 resource_context_.set_media_observer( |
518 io_thread_globals->media.media_internals.get()); | 522 io_thread_globals->media.media_internals.get()); |
519 resource_context_.set_media_stream_manager(media_stream_manager_.get()); | 523 resource_context_.set_media_stream_manager(media_stream_manager_.get()); |
520 resource_context_.set_audio_manager(profile_params_->audio_manager); | 524 resource_context_.set_audio_manager(profile_params_->audio_manager); |
521 | 525 |
522 LazyInitializeInternal(profile_params_.get()); | 526 LazyInitializeInternal(profile_params_.get()); |
523 | 527 |
(...skipping 27 matching lines...) Expand all Loading... |
551 &resource_context_)); | 555 &resource_context_)); |
552 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 556 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
553 if (!posted) | 557 if (!posted) |
554 delete this; | 558 delete this; |
555 } | 559 } |
556 | 560 |
557 void ProfileIOData::set_origin_bound_cert_service( | 561 void ProfileIOData::set_origin_bound_cert_service( |
558 net::OriginBoundCertService* origin_bound_cert_service) const { | 562 net::OriginBoundCertService* origin_bound_cert_service) const { |
559 origin_bound_cert_service_.reset(origin_bound_cert_service); | 563 origin_bound_cert_service_.reset(origin_bound_cert_service); |
560 } | 564 } |
OLD | NEW |