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 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1063 // KeyedService is trying to create a RequestContext at startup, | 1063 // KeyedService is trying to create a RequestContext at startup, |
1064 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is | 1064 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is |
1065 // invoked after all KeyedServices have been initialized (see | 1065 // invoked after all KeyedServices have been initialized (see |
1066 // http://crbug.com/171406). | 1066 // http://crbug.com/171406). |
1067 DCHECK(ssl_config_service_manager_) << | 1067 DCHECK(ssl_config_service_manager_) << |
1068 "SSLConfigServiceManager is not initialized yet"; | 1068 "SSLConfigServiceManager is not initialized yet"; |
1069 return ssl_config_service_manager_->Get(); | 1069 return ssl_config_service_manager_->Get(); |
1070 } | 1070 } |
1071 | 1071 |
1072 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { | 1072 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { |
| 1073 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
1073 if (!host_content_settings_map_.get()) { | 1074 if (!host_content_settings_map_.get()) { |
1074 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); | 1075 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); |
1075 } | 1076 } |
1076 return host_content_settings_map_.get(); | 1077 return host_content_settings_map_.get(); |
1077 } | 1078 } |
1078 | 1079 |
1079 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { | 1080 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { |
1080 #if defined(ENABLE_EXTENSIONS) | 1081 #if defined(ENABLE_EXTENSIONS) |
1081 return extensions::GuestViewManager::FromBrowserContext(this); | 1082 return extensions::GuestViewManager::FromBrowserContext(this); |
1082 #else | 1083 #else |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1378 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1379 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1379 domain_reliability::DomainReliabilityService* service = | 1380 domain_reliability::DomainReliabilityService* service = |
1380 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1381 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1381 GetForBrowserContext(this); | 1382 GetForBrowserContext(this); |
1382 if (!service) | 1383 if (!service) |
1383 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1384 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1384 | 1385 |
1385 return service->CreateMonitor( | 1386 return service->CreateMonitor( |
1386 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1387 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1387 } | 1388 } |
OLD | NEW |