| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "net/http/transport_security_state.h" | 54 #include "net/http/transport_security_state.h" |
| 55 #include "storage/browser/database/database_tracker.h" | 55 #include "storage/browser/database/database_tracker.h" |
| 56 | 56 |
| 57 #if defined(OS_ANDROID) | 57 #if defined(OS_ANDROID) |
| 58 #include "chrome/browser/media/protected_media_identifier_permission_context.h" | 58 #include "chrome/browser/media/protected_media_identifier_permission_context.h" |
| 59 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" | 59 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" |
| 60 #endif // defined(OS_ANDROID) | 60 #endif // defined(OS_ANDROID) |
| 61 | 61 |
| 62 #if defined(OS_ANDROID) || defined(OS_IOS) | 62 #if defined(OS_ANDROID) || defined(OS_IOS) |
| 63 #include "base/prefs/scoped_user_pref_update.h" | 63 #include "base/prefs/scoped_user_pref_update.h" |
| 64 #include "chrome/browser/prefs/proxy_prefs.h" | 64 #include "components/proxy_config/proxy_prefs.h" |
| 65 #endif // defined(OS_ANDROID) || defined(OS_IOS) | 65 #endif // defined(OS_ANDROID) || defined(OS_IOS) |
| 66 | 66 |
| 67 #if defined(OS_CHROMEOS) | 67 #if defined(OS_CHROMEOS) |
| 68 #include "chrome/browser/chromeos/preferences.h" | 68 #include "chrome/browser/chromeos/preferences.h" |
| 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 |
| (...skipping 517 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 |