Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 596613002: Remove content dependencies from content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: shutdown fix Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is 1120 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is
1121 // invoked after all KeyedServices have been initialized (see 1121 // invoked after all KeyedServices have been initialized (see
1122 // http://crbug.com/171406). 1122 // http://crbug.com/171406).
1123 DCHECK(ssl_config_service_manager_) << 1123 DCHECK(ssl_config_service_manager_) <<
1124 "SSLConfigServiceManager is not initialized yet"; 1124 "SSLConfigServiceManager is not initialized yet";
1125 return ssl_config_service_manager_->Get(); 1125 return ssl_config_service_manager_->Get();
1126 } 1126 }
1127 1127
1128 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { 1128 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
1129 if (!host_content_settings_map_.get()) { 1129 if (!host_content_settings_map_.get()) {
1130 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
1130 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); 1131 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
1131 } 1132 }
1132 return host_content_settings_map_.get(); 1133 return host_content_settings_map_.get();
1133 } 1134 }
1134 1135
1135 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 1136 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
1136 #if defined(ENABLE_EXTENSIONS) 1137 #if defined(ENABLE_EXTENSIONS)
1137 return extensions::GuestViewManager::FromBrowserContext(this); 1138 return extensions::GuestViewManager::FromBrowserContext(this);
1138 #else 1139 #else
1139 return NULL; 1140 return NULL;
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1456 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1457 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1457 GetForBrowserContext(this); 1458 GetForBrowserContext(this);
1458 if (!service) 1459 if (!service)
1459 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1460 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1460 1461
1461 return service->CreateMonitor( 1462 return service->CreateMonitor(
1462 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), 1463 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
1463 local_state, 1464 local_state,
1464 prefs::kMetricsReportingEnabled); 1465 prefs::kMetricsReportingEnabled);
1465 } 1466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698