| 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 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 866 } else { | 866 } else { |
| 867 chromeos::UserSessionManager::GetInstance()->RespectLocalePreferenceWrapper( | 867 chromeos::UserSessionManager::GetInstance()->RespectLocalePreferenceWrapper( |
| 868 this, base::Bind(&ProfileImpl::OnLocaleReady, base::Unretained(this))); | 868 this, base::Bind(&ProfileImpl::OnLocaleReady, base::Unretained(this))); |
| 869 } | 869 } |
| 870 #else | 870 #else |
| 871 OnLocaleReady(); | 871 OnLocaleReady(); |
| 872 #endif | 872 #endif |
| 873 } | 873 } |
| 874 | 874 |
| 875 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { | 875 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { |
| 876 Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); | 876 base::Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); |
| 877 Version arg_version(version); | 877 base::Version arg_version(version); |
| 878 return (profile_version.CompareTo(arg_version) >= 0); | 878 return (profile_version.CompareTo(arg_version) >= 0); |
| 879 } | 879 } |
| 880 | 880 |
| 881 void ProfileImpl::SetExitType(ExitType exit_type) { | 881 void ProfileImpl::SetExitType(ExitType exit_type) { |
| 882 #if defined(OS_CHROMEOS) | 882 #if defined(OS_CHROMEOS) |
| 883 if (chromeos::ProfileHelper::IsSigninProfile(this)) | 883 if (chromeos::ProfileHelper::IsSigninProfile(this)) |
| 884 return; | 884 return; |
| 885 #endif | 885 #endif |
| 886 if (!prefs_) | 886 if (!prefs_) |
| 887 return; | 887 return; |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1273 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1273 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
| 1274 domain_reliability::DomainReliabilityService* service = | 1274 domain_reliability::DomainReliabilityService* service = |
| 1275 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1275 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
| 1276 GetForBrowserContext(this); | 1276 GetForBrowserContext(this); |
| 1277 if (!service) | 1277 if (!service) |
| 1278 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1278 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
| 1279 | 1279 |
| 1280 return service->CreateMonitor( | 1280 return service->CreateMonitor( |
| 1281 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1281 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 1282 } | 1282 } |
| OLD | NEW |