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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 79 |
80 using content::BrowserThread; | 80 using content::BrowserThread; |
81 using content::DownloadManagerDelegate; | 81 using content::DownloadManagerDelegate; |
82 using content::HostZoomMap; | 82 using content::HostZoomMap; |
83 | 83 |
84 #if defined(ENABLE_EXTENSIONS) | 84 #if defined(ENABLE_EXTENSIONS) |
85 namespace { | 85 namespace { |
86 | 86 |
87 void NotifyOTRProfileCreatedOnIOThread(void* original_profile, | 87 void NotifyOTRProfileCreatedOnIOThread(void* original_profile, |
88 void* otr_profile) { | 88 void* otr_profile) { |
89 ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileCreated( | 89 ExtensionWebRequestEventRouter::GetInstance()->OnOTRBrowserContextCreated( |
90 original_profile, otr_profile); | 90 original_profile, otr_profile); |
91 } | 91 } |
92 | 92 |
93 void NotifyOTRProfileDestroyedOnIOThread(void* original_profile, | 93 void NotifyOTRProfileDestroyedOnIOThread(void* original_profile, |
94 void* otr_profile) { | 94 void* otr_profile) { |
95 ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileDestroyed( | 95 ExtensionWebRequestEventRouter::GetInstance()->OnOTRBrowserContextDestroyed( |
96 original_profile, otr_profile); | 96 original_profile, otr_profile); |
97 } | 97 } |
98 | 98 |
99 } // namespace | 99 } // namespace |
100 #endif | 100 #endif |
101 | 101 |
102 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile) | 102 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile) |
103 : profile_(real_profile), | 103 : profile_(real_profile), |
104 prefs_(PrefServiceSyncable::IncognitoFromProfile(real_profile)), | 104 prefs_(PrefServiceSyncable::IncognitoFromProfile(real_profile)), |
105 start_time_(Time::Now()) { | 105 start_time_(Time::Now()) { |
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
536 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 536 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
537 #if defined(OS_CHROMEOS) | 537 #if defined(OS_CHROMEOS) |
538 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 538 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
539 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 539 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
540 g_browser_process->local_state()); | 540 g_browser_process->local_state()); |
541 } | 541 } |
542 #endif // defined(OS_CHROMEOS) | 542 #endif // defined(OS_CHROMEOS) |
543 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 543 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
544 GetPrefs(), g_browser_process->local_state()); | 544 GetPrefs(), g_browser_process->local_state()); |
545 } | 545 } |
OLD | NEW |