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

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

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 // If ssl_config_service_manager_ is null, this typically means that some 981 // If ssl_config_service_manager_ is null, this typically means that some
982 // KeyedService is trying to create a RequestContext at startup, 982 // KeyedService is trying to create a RequestContext at startup,
983 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is 983 // but SSLConfigServiceManager is not initialized until DoFinalInit() which is
984 // invoked after all KeyedServices have been initialized (see 984 // invoked after all KeyedServices have been initialized (see
985 // http://crbug.com/171406). 985 // http://crbug.com/171406).
986 DCHECK(ssl_config_service_manager_) << 986 DCHECK(ssl_config_service_manager_) <<
987 "SSLConfigServiceManager is not initialized yet"; 987 "SSLConfigServiceManager is not initialized yet";
988 return ssl_config_service_manager_->Get(); 988 return ssl_config_service_manager_->Get();
989 } 989 }
990 990
991 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
992 // TODO(peconn): Once HostContentSettingsMapFactory works for TestingProfiles
993 // remove Profile::GetHostContentSettingsMap and replace all references to it.
994 // Don't forget to remove the #include "host_content_settings_map_factory"!
995 return HostContentSettingsMapFactory::GetForProfile(this);
996 }
997
998 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 991 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
999 #if defined(ENABLE_EXTENSIONS) 992 #if defined(ENABLE_EXTENSIONS)
1000 return guest_view::GuestViewManager::FromBrowserContext(this); 993 return guest_view::GuestViewManager::FromBrowserContext(this);
1001 #else 994 #else
1002 return NULL; 995 return NULL;
1003 #endif 996 #endif
1004 } 997 }
1005 998
1006 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { 999 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() {
1007 return DownloadServiceFactory::GetForBrowserContext(this)-> 1000 return DownloadServiceFactory::GetForBrowserContext(this)->
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1273 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1281 domain_reliability::DomainReliabilityService* service = 1274 domain_reliability::DomainReliabilityService* service =
1282 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1275 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1283 GetForBrowserContext(this); 1276 GetForBrowserContext(this);
1284 if (!service) 1277 if (!service)
1285 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); 1278 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
1286 1279
1287 return service->CreateMonitor( 1280 return service->CreateMonitor(
1288 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 1281 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
1289 } 1282 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698