| 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 <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 new extensions::ExtensionIconSource(profile_); | 159 new extensions::ExtensionIconSource(profile_); |
| 160 content::URLDataSource::Add(this, icon_source); | 160 content::URLDataSource::Add(this, icon_source); |
| 161 | 161 |
| 162 BrowserThread::PostTask( | 162 BrowserThread::PostTask( |
| 163 BrowserThread::IO, FROM_HERE, | 163 BrowserThread::IO, FROM_HERE, |
| 164 base::Bind(&NotifyOTRProfileCreatedOnIOThread, profile_, this)); | 164 base::Bind(&NotifyOTRProfileCreatedOnIOThread, profile_, this)); |
| 165 #endif | 165 #endif |
| 166 | 166 |
| 167 // The DomDistillerViewerSource is not a normal WebUI so it must be registered | 167 // The DomDistillerViewerSource is not a normal WebUI so it must be registered |
| 168 // as a URLDataSource early. | 168 // as a URLDataSource early. |
| 169 RegisterDomDistillerViewerSource(this); | 169 dom_distiller::RegisterViewerSource(this); |
| 170 } | 170 } |
| 171 | 171 |
| 172 OffTheRecordProfileImpl::~OffTheRecordProfileImpl() { | 172 OffTheRecordProfileImpl::~OffTheRecordProfileImpl() { |
| 173 MaybeSendDestroyedNotification(); | 173 MaybeSendDestroyedNotification(); |
| 174 | 174 |
| 175 #if defined(ENABLE_PLUGINS) | 175 #if defined(ENABLE_PLUGINS) |
| 176 ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext( | 176 ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext( |
| 177 io_data_->GetResourceContextNoInit()); | 177 io_data_->GetResourceContextNoInit()); |
| 178 #endif | 178 #endif |
| 179 | 179 |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { | 548 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { |
| 549 #if defined(OS_CHROMEOS) | 549 #if defined(OS_CHROMEOS) |
| 550 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 550 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 551 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 551 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 552 g_browser_process->local_state()); | 552 g_browser_process->local_state()); |
| 553 } | 553 } |
| 554 #endif // defined(OS_CHROMEOS) | 554 #endif // defined(OS_CHROMEOS) |
| 555 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 555 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 556 GetPrefs(), g_browser_process->local_state()); | 556 GetPrefs(), g_browser_process->local_state()); |
| 557 } | 557 } |
| OLD | NEW |