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

Side by Side Diff: chrome/browser/profiles/off_the_record_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
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/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 } 367 }
368 368
369 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() { 369 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() {
370 return io_data_->GetResourceContext(); 370 return io_data_->GetResourceContext();
371 } 371 }
372 372
373 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() { 373 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() {
374 return profile_->GetSSLConfigService(); 374 return profile_->GetSSLConfigService();
375 } 375 }
376 376
377 HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
378 // TODO(peconn): Once HostContentSettingsMapFactory works for TestingProfiles
379 // remove Profile::GetHostContentSettingsMap and replace all references to it.
380 // Don't forget to remove the #include "host_content_settings_map_factory"!
381 return HostContentSettingsMapFactory::GetForProfile(this);
382 }
383
384 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() { 377 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {
385 #if defined(ENABLE_EXTENSIONS) 378 #if defined(ENABLE_EXTENSIONS)
386 return guest_view::GuestViewManager::FromBrowserContext(this); 379 return guest_view::GuestViewManager::FromBrowserContext(this);
387 #else 380 #else
388 return NULL; 381 return NULL;
389 #endif 382 #endif
390 } 383 }
391 384
392 storage::SpecialStoragePolicy* 385 storage::SpecialStoragePolicy*
393 OffTheRecordProfileImpl::GetSpecialStoragePolicy() { 386 OffTheRecordProfileImpl::GetSpecialStoragePolicy() {
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 553 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
561 #if defined(OS_CHROMEOS) 554 #if defined(OS_CHROMEOS)
562 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 555 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
563 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 556 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
564 g_browser_process->local_state()); 557 g_browser_process->local_state());
565 } 558 }
566 #endif // defined(OS_CHROMEOS) 559 #endif // defined(OS_CHROMEOS)
567 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 560 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
568 GetPrefs(), g_browser_process->local_state()); 561 GetPrefs(), g_browser_process->local_state());
569 } 562 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698