Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 2258263002: Consistently use namespaced base::Version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased against master. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
1271 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { 1271 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) {
1272 domain_reliability::DomainReliabilityService* service = 1272 domain_reliability::DomainReliabilityService* service =
1273 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> 1273 domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
1274 GetForBrowserContext(this); 1274 GetForBrowserContext(this);
1275 if (!service) 1275 if (!service)
1276 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); 1276 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>();
1277 1277
1278 return service->CreateMonitor( 1278 return service->CreateMonitor(
1279 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); 1279 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
1280 } 1280 }
OLDNEW
« no previous file with comments | « chrome/browser/net/crl_set_fetcher.cc ('k') | chrome/browser/ui/startup/default_browser_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698