| 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 PluginPrefs::GetForProfile(this).get(), | 631 PluginPrefs::GetForProfile(this).get(), |
| 632 io_data_.GetResourceContextNoInit()); | 632 io_data_.GetResourceContextNoInit()); |
| 633 #endif | 633 #endif |
| 634 | 634 |
| 635 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); | 635 TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk"); |
| 636 content::BrowserContext::GetDefaultStoragePartition(this)-> | 636 content::BrowserContext::GetDefaultStoragePartition(this)-> |
| 637 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); | 637 GetDOMStorageContext()->SetSaveSessionStorageOnDisk(); |
| 638 | 638 |
| 639 // The DomDistillerViewerSource is not a normal WebUI so it must be registered | 639 // The DomDistillerViewerSource is not a normal WebUI so it must be registered |
| 640 // as a URLDataSource early. | 640 // as a URLDataSource early. |
| 641 RegisterDomDistillerViewerSource(this); | 641 dom_distiller::RegisterViewerSource(this); |
| 642 | 642 |
| 643 #if defined(OS_CHROMEOS) | 643 #if defined(OS_CHROMEOS) |
| 644 if (chromeos::UserSessionManager::GetInstance() | 644 if (chromeos::UserSessionManager::GetInstance() |
| 645 ->RestartToApplyPerSessionFlagsIfNeed(this, true)) { | 645 ->RestartToApplyPerSessionFlagsIfNeed(this, true)) { |
| 646 return; | 646 return; |
| 647 } | 647 } |
| 648 #endif | 648 #endif |
| 649 | 649 |
| 650 if (delegate_) { | 650 if (delegate_) { |
| 651 TRACE_EVENT0("browser", "ProfileImpl::DoFileInit:DelegateOnProfileCreated") | 651 TRACE_EVENT0("browser", "ProfileImpl::DoFileInit:DelegateOnProfileCreated") |
| (...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1282 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1282 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
| 1283 domain_reliability::DomainReliabilityService* service = | 1283 domain_reliability::DomainReliabilityService* service = |
| 1284 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1284 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1285 GetForBrowserContext(this); | 1285 GetForBrowserContext(this); |
| 1286 if (!service) | 1286 if (!service) |
| 1287 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1287 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1288 | 1288 |
| 1289 return service->CreateMonitor( | 1289 return service->CreateMonitor( |
| 1290 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1290 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
| 1291 } | 1291 } |
| OLD | NEW |