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

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

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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.h ('k') | chrome/installer/setup/install_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 6d75274590f591aa35bc9412e522b4f7f312fdec..fb1bd379b4749d2f159d37a8fab00de791fba097 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -186,8 +186,8 @@ installer::InstallStatus InstallNewVersion(
const base::FilePath& archive_path,
const base::FilePath& src_path,
const base::FilePath& temp_path,
- const base::Version& new_version,
- scoped_ptr<base::Version>* current_version) {
+ const Version& new_version,
+ scoped_ptr<Version>* current_version) {
DCHECK(current_version);
installer_state.UpdateStage(installer::BUILDING);
@@ -306,7 +306,7 @@ void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value) {
}
bool CreateVisualElementsManifest(const base::FilePath& src_path,
- const base::Version& version) {
+ const Version& version) {
// Construct the relative path to the versioned VisualElements directory.
base::string16 elements_dir(ASCIIToUTF16(version.GetString()));
elements_dir.push_back(base::FilePath::kSeparators[0]);
@@ -507,7 +507,7 @@ InstallStatus InstallOrUpdateProduct(
const base::FilePath& src_path,
const base::FilePath& prefs_path,
const MasterPreferences& prefs,
- const base::Version& new_version) {
+ const Version& new_version) {
DCHECK(!installer_state.products().empty());
// TODO(robertshield): Removing the pending on-reboot moves should be done
@@ -524,7 +524,7 @@ InstallStatus InstallOrUpdateProduct(
installer_state.UpdateStage(installer::CREATING_VISUAL_MANIFEST);
CreateVisualElementsManifest(src_path, new_version);
- scoped_ptr<base::Version> existing_version;
+ scoped_ptr<Version> existing_version;
InstallStatus result = InstallNewVersion(original_state, installer_state,
setup_path, archive_path, src_path, install_temp_path, new_version,
&existing_version);
« no previous file with comments | « chrome/installer/setup/install.h ('k') | chrome/installer/setup/install_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698