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

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: Removed Notification Subscription from SupervisedProvider 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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 } 366 }
367 367
368 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() { 368 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() {
369 return io_data_->GetResourceContext(); 369 return io_data_->GetResourceContext();
370 } 370 }
371 371
372 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() { 372 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() {
373 return profile_->GetSSLConfigService(); 373 return profile_->GetSSLConfigService();
374 } 374 }
375 375
376 HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
377 // TODO(peconn): Once HostContentSettingsMapFactory works for TestingProfiles
378 // remove Profile::GetHostContentSettingsMap and replace all references to it.
379 // Don't forget to remove the #include "host_content_settings_map_factory"!
380 return HostContentSettingsMapFactory::GetForProfile(this);
381 }
382
383 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() { 376 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() {
384 #if defined(ENABLE_EXTENSIONS) 377 #if defined(ENABLE_EXTENSIONS)
385 return guest_view::GuestViewManager::FromBrowserContext(this); 378 return guest_view::GuestViewManager::FromBrowserContext(this);
386 #else 379 #else
387 return NULL; 380 return NULL;
388 #endif 381 #endif
389 } 382 }
390 383
391 storage::SpecialStoragePolicy* 384 storage::SpecialStoragePolicy*
392 OffTheRecordProfileImpl::GetSpecialStoragePolicy() { 385 OffTheRecordProfileImpl::GetSpecialStoragePolicy() {
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 552 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
560 #if defined(OS_CHROMEOS) 553 #if defined(OS_CHROMEOS)
561 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 554 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
562 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 555 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
563 g_browser_process->local_state()); 556 g_browser_process->local_state());
564 } 557 }
565 #endif // defined(OS_CHROMEOS) 558 #endif // defined(OS_CHROMEOS)
566 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 559 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
567 GetPrefs(), g_browser_process->local_state()); 560 GetPrefs(), g_browser_process->local_state());
568 } 561 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698