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" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/stl_util.h" | 15 #include "base/stl_util.h" |
16 #include "base/string_number_conversions.h" | 16 #include "base/string_number_conversions.h" |
17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/content_settings/cookie_settings.h" | 18 #include "chrome/browser/content_settings/cookie_settings.h" |
19 #include "chrome/browser/content_settings/host_content_settings_map.h" | 19 #include "chrome/browser/content_settings/host_content_settings_map.h" |
20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" | 20 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
21 #include "chrome/browser/download/download_service.h" | 21 #include "chrome/browser/download/download_service.h" |
22 #include "chrome/browser/download/download_service_factory.h" | 22 #include "chrome/browser/download/download_service_factory.h" |
23 #include "chrome/browser/extensions/extension_info_map.h" | 23 #include "chrome/browser/extensions/extension_info_map.h" |
24 #include "chrome/browser/extensions/extension_protocols.h" | 24 #include "chrome/browser/extensions/extension_protocols.h" |
| 25 #include "chrome/browser/extensions/extension_system.h" |
| 26 #include "chrome/browser/extensions/extension_system_factory.h" |
25 #include "chrome/browser/io_thread.h" | 27 #include "chrome/browser/io_thread.h" |
26 #include "chrome/browser/media/media_internals.h" | 28 #include "chrome/browser/media/media_internals.h" |
27 #include "chrome/browser/net/chrome_cookie_notification_details.h" | 29 #include "chrome/browser/net/chrome_cookie_notification_details.h" |
28 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" | 30 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" |
29 #include "chrome/browser/net/chrome_net_log.h" | 31 #include "chrome/browser/net/chrome_net_log.h" |
30 #include "chrome/browser/net/chrome_network_delegate.h" | 32 #include "chrome/browser/net/chrome_network_delegate.h" |
31 #include "chrome/browser/net/proxy_service_factory.h" | 33 #include "chrome/browser/net/proxy_service_factory.h" |
32 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 34 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
33 #include "chrome/browser/policy/url_blacklist_manager.h" | 35 #include "chrome/browser/policy/url_blacklist_manager.h" |
34 #include "chrome/browser/prefs/pref_service.h" | 36 #include "chrome/browser/prefs/pref_service.h" |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 base::Callback<Profile*(void)> profile_getter = | 230 base::Callback<Profile*(void)> profile_getter = |
229 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), | 231 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), |
230 profile); | 232 profile); |
231 params->cookie_monster_delegate = | 233 params->cookie_monster_delegate = |
232 new ChromeCookieMonsterDelegate(profile_getter); | 234 new ChromeCookieMonsterDelegate(profile_getter); |
233 params->database_tracker = profile->GetDatabaseTracker(); | 235 params->database_tracker = profile->GetDatabaseTracker(); |
234 params->appcache_service = profile->GetAppCacheService(); | 236 params->appcache_service = profile->GetAppCacheService(); |
235 params->blob_storage_context = profile->GetBlobStorageContext(); | 237 params->blob_storage_context = profile->GetBlobStorageContext(); |
236 params->file_system_context = profile->GetFileSystemContext(); | 238 params->file_system_context = profile->GetFileSystemContext(); |
237 params->quota_manager = profile->GetQuotaManager(); | 239 params->quota_manager = profile->GetQuotaManager(); |
238 params->extension_info_map = profile->GetExtensionInfoMap(); | 240 params->extension_info_map = |
| 241 ExtensionSystemFactory::GetForProfile(profile)->info_map(); |
239 params->notification_service = | 242 params->notification_service = |
240 DesktopNotificationServiceFactory::GetForProfile(profile); | 243 DesktopNotificationServiceFactory::GetForProfile(profile); |
241 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); | 244 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); |
242 | 245 |
243 ChromeProxyConfigService* proxy_config_service = | 246 ChromeProxyConfigService* proxy_config_service = |
244 ProxyServiceFactory::CreateProxyConfigService(true); | 247 ProxyServiceFactory::CreateProxyConfigService(true); |
245 params->proxy_config_service.reset(proxy_config_service); | 248 params->proxy_config_service.reset(proxy_config_service); |
246 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( | 249 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( |
247 proxy_config_service); | 250 proxy_config_service); |
248 params->profile = profile; | 251 params->profile = profile; |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
551 &resource_context_)); | 554 &resource_context_)); |
552 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 555 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
553 if (!posted) | 556 if (!posted) |
554 delete this; | 557 delete this; |
555 } | 558 } |
556 | 559 |
557 void ProfileIOData::set_origin_bound_cert_service( | 560 void ProfileIOData::set_origin_bound_cert_service( |
558 net::OriginBoundCertService* origin_bound_cert_service) const { | 561 net::OriginBoundCertService* origin_bound_cert_service) const { |
559 origin_bound_cert_service_.reset(origin_bound_cert_service); | 562 origin_bound_cert_service_.reset(origin_bound_cert_service); |
560 } | 563 } |
OLD | NEW |