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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
867 } else { | 867 } else { |
868 chromeos::UserSessionManager::GetInstance()->RespectLocalePreferenceWrapper( | 868 chromeos::UserSessionManager::GetInstance()->RespectLocalePreferenceWrapper( |
869 this, base::Bind(&ProfileImpl::OnLocaleReady, base::Unretained(this))); | 869 this, base::Bind(&ProfileImpl::OnLocaleReady, base::Unretained(this))); |
870 } | 870 } |
871 #else | 871 #else |
872 OnLocaleReady(); | 872 OnLocaleReady(); |
873 #endif | 873 #endif |
874 } | 874 } |
875 | 875 |
876 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { | 876 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { |
877 Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); | 877 base::Version profile_version(ChromeVersionService::GetVersion(prefs_.get())); |
878 Version arg_version(version); | 878 base::Version arg_version(version); |
879 return (profile_version.CompareTo(arg_version) >= 0); | 879 return (profile_version.CompareTo(arg_version) >= 0); |
880 } | 880 } |
881 | 881 |
882 void ProfileImpl::SetExitType(ExitType exit_type) { | 882 void ProfileImpl::SetExitType(ExitType exit_type) { |
883 #if defined(OS_CHROMEOS) | 883 #if defined(OS_CHROMEOS) |
884 if (chromeos::ProfileHelper::IsSigninProfile(this)) | 884 if (chromeos::ProfileHelper::IsSigninProfile(this)) |
885 return; | 885 return; |
886 #endif | 886 #endif |
887 if (!prefs_) | 887 if (!prefs_) |
888 return; | 888 return; |
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1309 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { | 1309 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1310 domain_reliability::DomainReliabilityService* service = | 1310 domain_reliability::DomainReliabilityService* service = |
1311 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1311 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1312 GetForBrowserContext(this); | 1312 GetForBrowserContext(this); |
1313 if (!service) | 1313 if (!service) |
1314 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1314 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1315 | 1315 |
1316 return service->CreateMonitor( | 1316 return service->CreateMonitor( |
1317 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1317 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
1318 } | 1318 } |
OLD | NEW |