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