OLD | NEW |
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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 | 348 |
349 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() { | 349 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() { |
350 return io_data_->GetResourceContext(); | 350 return io_data_->GetResourceContext(); |
351 } | 351 } |
352 | 352 |
353 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() { | 353 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() { |
354 return profile_->GetSSLConfigService(); | 354 return profile_->GetSSLConfigService(); |
355 } | 355 } |
356 | 356 |
357 HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() { | 357 HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() { |
| 358 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
358 // Retrieve the host content settings map of the parent profile in order to | 359 // Retrieve the host content settings map of the parent profile in order to |
359 // ensure the preferences have been migrated. | 360 // ensure the preferences have been migrated. |
360 profile_->GetHostContentSettingsMap(); | 361 profile_->GetHostContentSettingsMap(); |
361 if (!host_content_settings_map_.get()) { | 362 if (!host_content_settings_map_.get()) { |
362 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), true); | 363 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), true); |
363 #if defined(ENABLE_EXTENSIONS) | 364 #if defined(ENABLE_EXTENSIONS) |
364 ExtensionService* extension_service = | 365 ExtensionService* extension_service = |
365 extensions::ExtensionSystem::Get(this)->extension_service(); | 366 extensions::ExtensionSystem::Get(this)->extension_service(); |
366 if (extension_service) { | 367 if (extension_service) { |
367 extension_service->RegisterContentSettings( | 368 extension_service->RegisterContentSettings( |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 542 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
542 #if defined(OS_CHROMEOS) | 543 #if defined(OS_CHROMEOS) |
543 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 544 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
544 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 545 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
545 g_browser_process->local_state()); | 546 g_browser_process->local_state()); |
546 } | 547 } |
547 #endif // defined(OS_CHROMEOS) | 548 #endif // defined(OS_CHROMEOS) |
548 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 549 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
549 GetPrefs(), g_browser_process->local_state()); | 550 GetPrefs(), g_browser_process->local_state()); |
550 } | 551 } |
OLD | NEW |