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

Unified Diff: chrome/installer/setup/setup_main.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/installer/setup/install_worker_unittest.cc ('k') | chrome/installer/setup/setup_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_main.cc
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 48fbe5430c9c1a73424cf46c193227c3f15267fc..f0df2e647b6349acc23b452b608b2bf6daae41df 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1091,16 +1091,16 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state,
BrowserDistribution* browser_dist = product->distribution();
// We started as system-level and have been re-launched as user level
// to continue with the toast experiment.
- scoped_ptr<Version> installed_version(
- InstallUtil::GetChromeVersion(browser_dist, true));
- if (!installed_version.get()) {
+ Version installed_version;
+ InstallUtil::GetChromeVersion(browser_dist, true, &installed_version);
+ if (!installed_version.IsValid()) {
LOG(ERROR) << "No installation of "
<< browser_dist->GetAppShortCutName()
<< " found for system-level toast.";
} else {
browser_dist->LaunchUserExperiment(cmd_line.GetProgram(),
installer::REENTRY_SYS_UPDATE,
- *installed_version, *product, true);
+ installed_version, *product, true);
}
}
} else if (cmd_line.HasSwitch(
« no previous file with comments | « chrome/installer/setup/install_worker_unittest.cc ('k') | chrome/installer/setup/setup_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698