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

Unified Diff: chrome/browser/ui/views/about_chrome_view.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugin_installer.cc ('k') | chrome/browser/upgrade_detector_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/about_chrome_view.cc
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 1b9766527ef415f8777eb871d7f79f5eaa5b7b23..b532f417d588da243fd4e2f943327a9d35daf193 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -700,16 +700,15 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
base::ThreadRestrictions::ScopedAllowIO allow_io;
chrome::VersionInfo version_info;
- scoped_ptr<Version> installed_version(
- InstallUtil::GetChromeVersion(dist, false));
- if (!installed_version.get()) {
+ Version installed_version;
+ InstallUtil::GetChromeVersion(dist, false, &installed_version);
+ if (!installed_version.IsValid()) {
// User-level Chrome is not installed, check system-level.
- installed_version.reset(InstallUtil::GetChromeVersion(dist, true));
+ InstallUtil::GetChromeVersion(dist, true, &installed_version);
}
- scoped_ptr<Version> running_version(
- Version::GetVersionFromString(version_info.Version()));
- if (!installed_version.get() ||
- (installed_version->CompareTo(*running_version) <= 0)) {
+ Version running_version(version_info.Version());
+ if (!installed_version.IsValid() ||
+ (installed_version.CompareTo(running_version) <= 0)) {
content::RecordAction(
UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
string16 update_label_text = l10n_util::GetStringFUTF16(
« no previous file with comments | « chrome/browser/plugin_installer.cc ('k') | chrome/browser/upgrade_detector_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698