summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup/install.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 16:06:13 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 16:06:13 +0000
commitc5e4a2224ab96a7380e768c6a6148985accd3488 (patch)
tree993cafd3bd7514df75ff773879d3633ee916e3f8 /chrome/installer/setup/install.cc
parent3bc2e375275d2e3a2aa0d8766d8e17f766ddbf78 (diff)
downloadchromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.zip
chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.tar.gz
chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.tar.bz2
Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the header."
This is a speculative revert of r242414. BUG=330681 TEST=as in bug TBR=ben@chromium.org Review URL: https://codereview.chromium.org/109673004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install.cc')
-rw-r--r--chrome/installer/setup/install.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 6d75274..fb1bd37 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);