OLD | NEW |
---|---|
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_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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
217 | 217 |
218 params->host_content_settings_map = profile->GetHostContentSettingsMap(); | 218 params->host_content_settings_map = profile->GetHostContentSettingsMap(); |
219 params->cookie_settings = CookieSettings::Factory::GetForProfile(profile); | 219 params->cookie_settings = CookieSettings::Factory::GetForProfile(profile); |
220 params->ssl_config_service = profile->GetSSLConfigService(); | 220 params->ssl_config_service = profile->GetSSLConfigService(); |
221 base::Callback<Profile*(void)> profile_getter = | 221 base::Callback<Profile*(void)> profile_getter = |
222 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), | 222 base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(), |
223 profile); | 223 profile); |
224 params->cookie_monster_delegate = | 224 params->cookie_monster_delegate = |
225 new ChromeCookieMonsterDelegate(profile_getter); | 225 new ChromeCookieMonsterDelegate(profile_getter); |
226 params->extension_info_map = profile->GetExtensionInfoMap(); | 226 params->extension_info_map = profile->GetExtensionInfoMap(); |
227 | |
228 #if defined(ENABLE_NOTIFICATIONS) | |
willchan no longer on Chromium
2012/02/24 02:33:21
So...should you remove notification_service from P
gone
2012/02/24 02:58:29
Yeah, I can take that out. Just ProfileParams::no
willchan no longer on Chromium
2012/02/24 17:41:35
ProfileIOData::notification_service_ too makes sen
| |
227 params->notification_service = | 229 params->notification_service = |
228 DesktopNotificationServiceFactory::GetForProfile(profile); | 230 DesktopNotificationServiceFactory::GetForProfile(profile); |
231 #endif | |
232 | |
229 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); | 233 params->protocol_handler_registry = profile->GetProtocolHandlerRegistry(); |
230 | 234 |
231 ChromeProxyConfigService* proxy_config_service = | 235 ChromeProxyConfigService* proxy_config_service = |
232 ProxyServiceFactory::CreateProxyConfigService(true); | 236 ProxyServiceFactory::CreateProxyConfigService(true); |
233 params->proxy_config_service.reset(proxy_config_service); | 237 params->proxy_config_service.reset(proxy_config_service); |
234 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( | 238 profile->GetProxyConfigTracker()->SetChromeProxyConfigService( |
235 proxy_config_service); | 239 proxy_config_service); |
236 params->profile = profile; | 240 params->profile = profile; |
237 profile_params_.reset(params.release()); | 241 profile_params_.reset(params.release()); |
238 | 242 |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
549 &resource_context_)); | 553 &resource_context_)); |
550 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 554 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
551 if (!posted) | 555 if (!posted) |
552 delete this; | 556 delete this; |
553 } | 557 } |
554 | 558 |
555 void ProfileIOData::set_origin_bound_cert_service( | 559 void ProfileIOData::set_origin_bound_cert_service( |
556 net::OriginBoundCertService* origin_bound_cert_service) const { | 560 net::OriginBoundCertService* origin_bound_cert_service) const { |
557 origin_bound_cert_service_.reset(origin_bound_cert_service); | 561 origin_bound_cert_service_.reset(origin_bound_cert_service); |
558 } | 562 } |
OLD | NEW |