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 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1072 // KeyedService is trying to create a RequestContext at startup, | 1072 // KeyedService is trying to create a RequestContext at startup, |
1073 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is | 1073 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is |
1074 // invoked after all KeyedServices have been initialized (see | 1074 // invoked after all KeyedServices have been initialized (see |
1075 // http://crbug.com/171406). | 1075 // http://crbug.com/171406). |
1076 DCHECK(ssl_config_service_manager_) << | 1076 DCHECK(ssl_config_service_manager_) << |
1077 "SSLConfigServiceManager is not initialized yet"; | 1077 "SSLConfigServiceManager is not initialized yet"; |
1078 return ssl_config_service_manager_->Get(); | 1078 return ssl_config_service_manager_->Get(); |
1079 } | 1079 } |
1080 | 1080 |
1081 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { | 1081 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { |
| 1082 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
1082 if (!host_content_settings_map_.get()) { | 1083 if (!host_content_settings_map_.get()) { |
1083 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); | 1084 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); |
1084 } | 1085 } |
1085 return host_content_settings_map_.get(); | 1086 return host_content_settings_map_.get(); |
1086 } | 1087 } |
1087 | 1088 |
1088 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { | 1089 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { |
1089 #if defined(ENABLE_EXTENSIONS) | 1090 #if defined(ENABLE_EXTENSIONS) |
1090 return extensions::GuestViewManager::FromBrowserContext(this); | 1091 return extensions::GuestViewManager::FromBrowserContext(this); |
1091 #else | 1092 #else |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1387 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1388 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1388 domain_reliability::DomainReliabilityService* service = | 1389 domain_reliability::DomainReliabilityService* service = |
1389 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1390 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1390 GetForBrowserContext(this); | 1391 GetForBrowserContext(this); |
1391 if (!service) | 1392 if (!service) |
1392 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1393 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1393 | 1394 |
1394 return service->CreateMonitor( | 1395 return service->CreateMonitor( |
1395 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1396 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1396 } | 1397 } |
OLD | NEW |