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

Unified Diff: chrome/installer/setup/setup_main.cc

Issue 2258243002: Consistently use namespaced base::Version in chrome/installer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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.h » ('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 3ebe6d886c3ecffcdd11bebe74d4b4756826acf2..d15f94ab1b7413ee40971c27b982287920b14591 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -155,7 +155,7 @@ LONG OverwriteDisplayVersions(const base::string16& product,
void DelayedOverwriteDisplayVersions(const base::FilePath& setup_exe,
const std::string& id,
- const Version& version) {
+ const base::Version& version) {
// This process has to be able to exit so we launch ourselves with
// instructions on what to do and then return.
base::CommandLine command_line(setup_exe);
@@ -1313,7 +1313,7 @@ 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.
- Version installed_version;
+ base::Version installed_version;
InstallUtil::GetChromeVersion(browser_dist, true, &installed_version);
if (!installed_version.IsValid()) {
LOG(ERROR) << "No installation of "
@@ -1524,7 +1524,7 @@ InstallStatus InstallProductsHelper(const InstallationState& original_state,
VLOG(1) << "unpacked to " << unpack_path.value();
base::FilePath src_path(
unpack_path.Append(kInstallSourceChromeDir));
- std::unique_ptr<Version> installer_version(
+ std::unique_ptr<base::Version> installer_version(
GetMaxVersionFromArchiveDir(src_path));
if (!installer_version.get()) {
LOG(ERROR) << "Did not find any valid version in installer.";
« no previous file with comments | « chrome/installer/setup/install_worker_unittest.cc ('k') | chrome/installer/setup/setup_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698