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

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

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 5 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/setup_util.h ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_util.cc
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index 0565488cc33bd1ba9913fbf74dc578d8ea2dec38..20b73e6aa4b6a7ce41fa954cd6312b0d400fbb6a 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -142,22 +142,22 @@ int BsdiffPatchFiles(const base::FilePath& src,
return exit_code;
}
-Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) {
+base::Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) {
VLOG(1) << "Looking for Chrome version folder under " << chrome_path.value();
base::FileEnumerator version_enum(chrome_path, false,
base::FileEnumerator::DIRECTORIES);
// TODO(tommi): The version directory really should match the version of
// setup.exe. To begin with, we should at least DCHECK that that's true.
- scoped_ptr<Version> max_version(new Version("0.0.0.0"));
+ scoped_ptr<base::Version> max_version(new base::Version("0.0.0.0"));
bool version_found = false;
while (!version_enum.Next().empty()) {
base::FileEnumerator::FileInfo find_data = version_enum.GetInfo();
VLOG(1) << "directory found: " << find_data.GetName().value();
- scoped_ptr<Version> found_version(
- new Version(base::UTF16ToASCII(find_data.GetName().value())));
+ scoped_ptr<base::Version> found_version(
+ new base::Version(base::UTF16ToASCII(find_data.GetName().value())));
if (found_version->IsValid() &&
found_version->CompareTo(*max_version.get()) > 0) {
max_version.reset(found_version.release());
@@ -190,7 +190,7 @@ base::FilePath FindArchiveToPatch(const InstallationState& original_state,
if (base::PathExists(patch_source))
return patch_source;
}
- scoped_ptr<Version> version(
+ scoped_ptr<base::Version> version(
installer::GetMaxVersionFromArchiveDir(installer_state.target_path()));
if (version) {
patch_source = installer_state.GetInstallerDirectory(*version)
@@ -263,7 +263,7 @@ bool DeleteFileFromTempProcess(const base::FilePath& path,
bool GetExistingHigherInstaller(
const InstallationState& original_state,
bool system_install,
- const Version& installer_version,
+ const base::Version& installer_version,
base::FilePath* setup_exe) {
DCHECK(setup_exe);
bool trying_single_browser = false;
« no previous file with comments | « chrome/installer/setup/setup_util.h ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698