| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 69 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 70 #endif | 70 #endif |
| 71 | 71 |
| 72 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) | 72 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) |
| 73 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" | 73 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" |
| 74 #endif | 74 #endif |
| 75 | 75 |
| 76 #if defined(ENABLE_EXTENSIONS) | 76 #if defined(ENABLE_EXTENSIONS) |
| 77 #include "chrome/browser/extensions/extension_service.h" | 77 #include "chrome/browser/extensions/extension_service.h" |
| 78 #include "chrome/browser/extensions/extension_special_storage_policy.h" | 78 #include "chrome/browser/extensions/extension_special_storage_policy.h" |
| 79 #include "components/guest_view/browser/guest_view_manager.h" |
| 79 #include "extensions/browser/api/web_request/web_request_api.h" | 80 #include "extensions/browser/api/web_request/web_request_api.h" |
| 80 #include "extensions/browser/extension_system.h" | 81 #include "extensions/browser/extension_system.h" |
| 81 #include "extensions/browser/guest_view/guest_view_manager.h" | |
| 82 #include "extensions/common/extension.h" | 82 #include "extensions/common/extension.h" |
| 83 #endif | 83 #endif |
| 84 | 84 |
| 85 #if defined(ENABLE_SUPERVISED_USERS) | 85 #if defined(ENABLE_SUPERVISED_USERS) |
| 86 #include "chrome/browser/content_settings/content_settings_supervised_provider.h
" | 86 #include "chrome/browser/content_settings/content_settings_supervised_provider.h
" |
| 87 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" | 87 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" |
| 88 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" | 88 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" |
| 89 #endif | 89 #endif |
| 90 | 90 |
| 91 using content::BrowserThread; | 91 using content::BrowserThread; |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 host_content_settings_map_->RegisterProvider( | 408 host_content_settings_map_->RegisterProvider( |
| 409 HostContentSettingsMap::SUPERVISED_PROVIDER, | 409 HostContentSettingsMap::SUPERVISED_PROVIDER, |
| 410 supervised_provider.Pass()); | 410 supervised_provider.Pass()); |
| 411 #endif | 411 #endif |
| 412 } | 412 } |
| 413 return host_content_settings_map_.get(); | 413 return host_content_settings_map_.get(); |
| 414 } | 414 } |
| 415 | 415 |
| 416 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() { | 416 content::BrowserPluginGuestManager* OffTheRecordProfileImpl::GetGuestManager() { |
| 417 #if defined(ENABLE_EXTENSIONS) | 417 #if defined(ENABLE_EXTENSIONS) |
| 418 return extensions::GuestViewManager::FromBrowserContext(this); | 418 return guestview::GuestViewManager::FromBrowserContext(this); |
| 419 #else | 419 #else |
| 420 return NULL; | 420 return NULL; |
| 421 #endif | 421 #endif |
| 422 } | 422 } |
| 423 | 423 |
| 424 storage::SpecialStoragePolicy* | 424 storage::SpecialStoragePolicy* |
| 425 OffTheRecordProfileImpl::GetSpecialStoragePolicy() { | 425 OffTheRecordProfileImpl::GetSpecialStoragePolicy() { |
| 426 #if defined(ENABLE_EXTENSIONS) | 426 #if defined(ENABLE_EXTENSIONS) |
| 427 return GetExtensionSpecialStoragePolicy(); | 427 return GetExtensionSpecialStoragePolicy(); |
| 428 #else | 428 #else |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 592 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
| 593 #if defined(OS_CHROMEOS) | 593 #if defined(OS_CHROMEOS) |
| 594 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 594 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 595 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 595 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 596 g_browser_process->local_state()); | 596 g_browser_process->local_state()); |
| 597 } | 597 } |
| 598 #endif // defined(OS_CHROMEOS) | 598 #endif // defined(OS_CHROMEOS) |
| 599 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 599 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 600 GetPrefs(), g_browser_process->local_state()); | 600 GetPrefs(), g_browser_process->local_state()); |
| 601 } | 601 } |
| OLD | NEW |