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

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: browser_tests fix Created 6 years, 2 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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is 1116 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is
1117 // invoked after all KeyedServices have been initialized (see 1117 // invoked after all KeyedServices have been initialized (see
1118 // http://crbug.com/171406). 1118 // http://crbug.com/171406).
1119 DCHECK(ssl_config_service_manager_) << 1119 DCHECK(ssl_config_service_manager_) <<
1120 "SSLConfigServiceManager is not initialized yet"; 1120 "SSLConfigServiceManager is not initialized yet";
1121 return ssl_config_service_manager_->Get(); 1121 return ssl_config_service_manager_->Get();
1122 } 1122 }
1123 1123
1124 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { 1124 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
1125 if (!host_content_settings_map_.get()) { 1125 if (!host_content_settings_map_.get()) {
1126 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
rpetterson 2014/09/26 03:46:34 same question as above
1126 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); 1127 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
1127 } 1128 }
1128 return host_content_settings_map_.get(); 1129 return host_content_settings_map_.get();
1129 } 1130 }
1130 1131
1131 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 1132 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
1132 #if defined(ENABLE_EXTENSIONS) 1133 #if defined(ENABLE_EXTENSIONS)
1133 return extensions::GuestViewManager::FromBrowserContext(this); 1134 return extensions::GuestViewManager::FromBrowserContext(this);
1134 #else 1135 #else
1135 return NULL; 1136 return NULL;
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1453 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1453 GetForBrowserContext(this); 1454 GetForBrowserContext(this);
1454 if (!service) 1455 if (!service)
1455 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1456 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1456 1457
1457 return service->CreateMonitor( 1458 return service->CreateMonitor(
1458 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), 1459 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
1459 local_state, 1460 local_state,
1460 prefs::kMetricsReportingEnabled); 1461 prefs::kMetricsReportingEnabled);
1461 } 1462 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698