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

Unified Diff: chrome/installer/setup/install.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/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 60e368b5f10f49379d2fb32cf850722ebe14a69b..b94576330a9edffff2eb1408d16931225c40f4c2 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -183,8 +183,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);
@@ -280,7 +280,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(base::ASCIIToUTF16(version.GetString()));
elements_dir.push_back(base::FilePath::kSeparators[0]);
@@ -489,7 +489,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
@@ -506,7 +506,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);
« 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