Chromium Code Reviews| 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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 617 // Make sure we initialize the ProfileIOData after everything else has been | 617 // Make sure we initialize the ProfileIOData after everything else has been |
| 618 // initialized that we might be reading from the IO thread. | 618 // initialized that we might be reading from the IO thread. |
| 619 | 619 |
| 620 io_data_.Init(cookie_path, channel_id_path, cache_path, | 620 io_data_.Init(cookie_path, channel_id_path, cache_path, |
| 621 cache_max_size, media_cache_path, media_cache_max_size, | 621 cache_max_size, media_cache_path, media_cache_max_size, |
| 622 extensions_cookie_path, GetPath(), predictor_, | 622 extensions_cookie_path, GetPath(), predictor_, |
| 623 session_cookie_mode, GetSpecialStoragePolicy(), | 623 session_cookie_mode, GetSpecialStoragePolicy(), |
| 624 CreateDomainReliabilityMonitor(local_state)); | 624 CreateDomainReliabilityMonitor(local_state)); |
| 625 | 625 |
| 626 #if defined(ENABLE_PLUGINS) | 626 #if defined(ENABLE_PLUGINS) |
| 627 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( | 627 ChromePluginServiceFilter::GetInstance()->RegisterResourceContext( |
|
Lei Zhang
2016/08/15 18:37:56
Can we just pass in |this|, and have RegisterResou
trizzofo
2016/08/15 20:35:58
Yes. Done!
| |
| 628 PluginPrefs::GetForProfile(this).get(), | 628 PluginPrefs::GetForProfile(this).get(), |
| 629 HostContentSettingsMapFactory::GetForProfile(this), | 629 HostContentSettingsMapFactory::GetForProfile(this), this, |
| 630 io_data_.GetResourceContextNoInit()); | 630 io_data_.GetResourceContextNoInit()); |
| 631 #endif | 631 #endif |
| 632 | 632 |
| 633 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); | 633 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); |
| 634 content::BrowserContext::GetDefaultStoragePartition(this)-> | 634 content::BrowserContext::GetDefaultStoragePartition(this)-> |
| 635 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); | 635 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); |
| 636 | 636 |
| 637 // The DomDistillerViewerSource is not a normal WebUI so it must be registered | 637 // The DomDistillerViewerSource is not a normal WebUI so it must be registered |
| 638 // as a URLDataSource early. | 638 // as a URLDataSource early. |
| 639 dom_distiller::RegisterViewerSource(this); | 639 dom_distiller::RegisterViewerSource(this); |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1278 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1278 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
| 1279 domain_reliability::DomainReliabilityService* service = | 1279 domain_reliability::DomainReliabilityService* service = |
| 1280 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1280 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1281 GetForBrowserContext(this); | 1281 GetForBrowserContext(this); |
| 1282 if (!service) | 1282 if (!service) |
| 1283 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1283 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1284 | 1284 |
| 1285 return service->CreateMonitor( | 1285 return service->CreateMonitor( |
| 1286 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1286 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 1287 } | 1287 } |
| OLD | NEW |