| 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_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 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 // KeyedService is trying to create a RequestContext at startup, | 1098 // KeyedService is trying to create a RequestContext at startup, |
| 1099 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is | 1099 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is |
| 1100 // invoked after all KeyedServices have been initialized (see | 1100 // invoked after all KeyedServices have been initialized (see |
| 1101 // http://crbug.com/171406). | 1101 // http://crbug.com/171406). |
| 1102 DCHECK(ssl_config_service_manager_) << | 1102 DCHECK(ssl_config_service_manager_) << |
| 1103 "SSLConfigServiceManager is not initialized yet"; | 1103 "SSLConfigServiceManager is not initialized yet"; |
| 1104 return ssl_config_service_manager_->Get(); | 1104 return ssl_config_service_manager_->Get(); |
| 1105 } | 1105 } |
| 1106 | 1106 |
| 1107 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { | 1107 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { |
| 1108 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 1108 if (!host_content_settings_map_.get()) { | 1109 if (!host_content_settings_map_.get()) { |
| 1109 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); | 1110 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); |
| 1110 } | 1111 } |
| 1111 return host_content_settings_map_.get(); | 1112 return host_content_settings_map_.get(); |
| 1112 } | 1113 } |
| 1113 | 1114 |
| 1114 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { | 1115 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { |
| 1115 #if defined(ENABLE_EXTENSIONS) | 1116 #if defined(ENABLE_EXTENSIONS) |
| 1116 return extensions::GuestViewManager::FromBrowserContext(this); | 1117 return extensions::GuestViewManager::FromBrowserContext(this); |
| 1117 #else | 1118 #else |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1433 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1434 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
| 1434 domain_reliability::DomainReliabilityService* service = | 1435 domain_reliability::DomainReliabilityService* service = |
| 1435 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1436 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1436 GetForBrowserContext(this); | 1437 GetForBrowserContext(this); |
| 1437 if (!service) | 1438 if (!service) |
| 1438 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1439 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1439 | 1440 |
| 1440 return service->CreateMonitor( | 1441 return service->CreateMonitor( |
| 1441 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1442 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 1442 } | 1443 } |
| OLD | NEW |