| 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/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 | 620 |
| 621 io_data_.Init(cookie_path, channel_id_path, cache_path, | 621 io_data_.Init(cookie_path, channel_id_path, cache_path, |
| 622 cache_max_size, media_cache_path, media_cache_max_size, | 622 cache_max_size, media_cache_path, media_cache_max_size, |
| 623 extensions_cookie_path, GetPath(), predictor_, | 623 extensions_cookie_path, GetPath(), predictor_, |
| 624 session_cookie_mode, GetSpecialStoragePolicy(), | 624 session_cookie_mode, GetSpecialStoragePolicy(), |
| 625 CreateDomainReliabilityMonitor(local_state)); | 625 CreateDomainReliabilityMonitor(local_state)); |
| 626 | 626 |
| 627 #if defined(ENABLE_PLUGINS) | 627 #if defined(ENABLE_PLUGINS) |
| 628 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( | 628 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( |
| 629 PluginPrefs::GetForProfile(this).get(), | 629 PluginPrefs::GetForProfile(this).get(), |
| 630 HostContentSettingsMapFactory::GetForProfile(this), |
| 630 io_data_.GetResourceContextNoInit()); | 631 io_data_.GetResourceContextNoInit()); |
| 631 #endif | 632 #endif |
| 632 | 633 |
| 633 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); | 634 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); |
| 634 content::BrowserContext::GetDefaultStoragePartition(this)-> | 635 content::BrowserContext::GetDefaultStoragePartition(this)-> |
| 635 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); | 636 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); |
| 636 | 637 |
| 637 // The DomDistillerViewerSource is not a normal WebUI so it must be registered | 638 // The DomDistillerViewerSource is not a normal WebUI so it must be registered |
| 638 // as a URLDataSource early. | 639 // as a URLDataSource early. |
| 639 dom_distiller::RegisterViewerSource(this); | 640 dom_distiller::RegisterViewerSource(this); |
| (...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1280 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1281 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
| 1281 domain_reliability::DomainReliabilityService* service = | 1282 domain_reliability::DomainReliabilityService* service = |
| 1282 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1283 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1283 GetForBrowserContext(this); | 1284 GetForBrowserContext(this); |
| 1284 if (!service) | 1285 if (!service) |
| 1285 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1286 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1286 | 1287 |
| 1287 return service->CreateMonitor( | 1288 return service->CreateMonitor( |
| 1288 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1289 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 1289 } | 1290 } |
| OLD | NEW |