Index: chrome/installer/setup/install.cc |
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc |
index 707fae9be4b0639b198296ce5eddee874ae902d3..41c8fe077168c3542d59811a78a1ea20853efce4 100644 |
--- a/chrome/installer/setup/install.cc |
+++ b/chrome/installer/setup/install.cc |
@@ -184,8 +184,8 @@ installer::InstallStatus InstallNewVersion( |
const base::FilePath& archive_path, |
const base::FilePath& src_path, |
const base::FilePath& temp_path, |
- const Version& new_version, |
- scoped_ptr<Version>* current_version) { |
+ const base::Version& new_version, |
+ scoped_ptr<base::Version>* current_version) { |
DCHECK(current_version); |
installer_state.UpdateStage(installer::BUILDING); |
@@ -304,7 +304,7 @@ void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value) { |
} |
bool CreateVisualElementsManifest(const base::FilePath& src_path, |
- const Version& version) { |
+ const base::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]); |
@@ -505,7 +505,7 @@ InstallStatus InstallOrUpdateProduct( |
const base::FilePath& src_path, |
const base::FilePath& prefs_path, |
const MasterPreferences& prefs, |
- const Version& new_version) { |
+ const base::Version& new_version) { |
DCHECK(!installer_state.products().empty()); |
// TODO(robertshield): Removing the pending on-reboot moves should be done |
@@ -522,7 +522,7 @@ InstallStatus InstallOrUpdateProduct( |
installer_state.UpdateStage(installer::CREATING_VISUAL_MANIFEST); |
CreateVisualElementsManifest(src_path, new_version); |
- scoped_ptr<Version> existing_version; |
+ scoped_ptr<base::Version> existing_version; |
InstallStatus result = InstallNewVersion(original_state, installer_state, |
setup_path, archive_path, src_path, install_temp_path, new_version, |
&existing_version); |