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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/setup/install_worker.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_unittest.cc ('k') | chrome/installer/setup/install_worker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 8daa86ad6071d86cba6ce40f4819078bd5329c12..16aebce0bb413c95e1bbc14dd799114ae7a22e5d 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -114,8 +114,8 @@ void GetIELowRightsElevationPolicyKeyPath(ElevationPolicyId policy,
// products managed by a given package.
// |old_version| can be NULL to indicate no Chrome is currently installed.
void AddRegisterComDllWorkItemsForPackage(const InstallerState& installer_state,
- const base::Version* old_version,
- const base::Version& new_version,
+ const Version* old_version,
+ const Version& new_version,
WorkItemList* work_item_list) {
// First collect the list of DLLs to be registered from each product.
std::vector<base::FilePath> com_dll_list;
@@ -157,7 +157,7 @@ void AddInstallerCopyTasks(const InstallerState& installer_state,
const base::FilePath& setup_path,
const base::FilePath& archive_path,
const base::FilePath& temp_path,
- const base::Version& new_version,
+ const Version& new_version,
WorkItemList* install_list) {
DCHECK(install_list);
base::FilePath installer_dir(
@@ -230,7 +230,7 @@ base::string16 GetRegCommandKey(BrowserDistribution* dist,
// 4. The command is run as the user.
void AddCommandWithParameterWorkItems(const InstallerState& installer_state,
const InstallationState& machine_state,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
const wchar_t* command_key,
const wchar_t* app,
@@ -262,7 +262,7 @@ void AddCommandWithParameterWorkItems(const InstallerState& installer_state,
void AddInstallAppCommandWorkItems(const InstallerState& installer_state,
const InstallationState& machine_state,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* work_item_list) {
DCHECK(product.is_chrome_app_host());
@@ -276,7 +276,7 @@ void AddInstallAppCommandWorkItems(const InstallerState& installer_state,
void AddInstallExtensionCommandWorkItem(const InstallerState& installer_state,
const InstallationState& machine_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* work_item_list) {
DCHECK(product.is_chrome());
@@ -296,7 +296,7 @@ CommandLine GetGenericQuickEnableCommand(
const InstallerState& installer_state,
const InstallationState& machine_state,
const base::FilePath& setup_path,
- const base::Version& new_version) {
+ const Version& new_version) {
// Only valid for multi-install operations.
DCHECK(installer_state.is_multi_install());
// Only valid when Chrome Binaries aren't being uninstalled.
@@ -341,7 +341,7 @@ void AddQuickEnableApplicationLauncherWorkItems(
const InstallerState& installer_state,
const InstallationState& machine_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
WorkItemList* work_item_list) {
DCHECK(work_item_list);
@@ -376,7 +376,7 @@ void AddQuickEnableApplicationLauncherWorkItems(
void AddProductSpecificWorkItems(const InstallationState& original_state,
const InstallerState& installer_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
WorkItemList* list) {
const Products& products = installer_state.products();
for (Products::const_iterator it = products.begin(); it < products.end();
@@ -457,8 +457,8 @@ void AddChromeWorkItems(const InstallationState& original_state,
const base::FilePath& archive_path,
const base::FilePath& src_path,
const base::FilePath& temp_path,
- const base::Version* current_version,
- const base::Version& new_version,
+ const Version* current_version,
+ const Version& new_version,
WorkItemList* install_list) {
const base::FilePath& target_path = installer_state.target_path();
@@ -661,7 +661,7 @@ void CleanupBadCanaryDelegateExecuteRegistration(
// state key if running under an MSI installer.
void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* install_list) {
HKEY reg_root = installer_state.root_key();
@@ -759,7 +759,7 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
// product version as the last step.
void AddVersionKeyWorkItems(HKEY root,
BrowserDistribution* dist,
- const base::Version& new_version,
+ const Version& new_version,
bool add_language_identifier,
WorkItemList* list) {
// Create Version key for each distribution (if not already present) and set
@@ -1005,8 +1005,8 @@ void AddUsageStatsWorkItems(const InstallationState& original_state,
bool AppendPostInstallTasks(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const base::Version* current_version,
- const base::Version& new_version,
+ const Version* current_version,
+ const Version& new_version,
const base::FilePath& temp_path,
WorkItemList* post_install_task_list) {
DCHECK(post_install_task_list);
@@ -1028,7 +1028,7 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
// |critical_version| will be valid only if this in-use update includes a
// version considered critical relative to the version being updated.
- base::Version critical_version(installer_state.DetermineCriticalVersion(
+ Version critical_version(installer_state.DetermineCriticalVersion(
current_version, new_version));
base::FilePath installer_path(
installer_state.GetInstallerDirectory(new_version).Append(
@@ -1132,8 +1132,8 @@ void AddInstallWorkItems(const InstallationState& original_state,
const base::FilePath& archive_path,
const base::FilePath& src_path,
const base::FilePath& temp_path,
- const base::Version* current_version,
- const base::Version& new_version,
+ const Version* current_version,
+ const Version& new_version,
WorkItemList* install_list) {
DCHECK(install_list);
@@ -1261,7 +1261,7 @@ void AddSetMsiMarkerWorkItem(const InstallerState& installer_state,
void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
const base::FilePath& target_path,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* list) {
base::string16 handler_class_uuid;
@@ -1323,7 +1323,7 @@ void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
void AddActiveSetupWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* list) {
DCHECK(installer_state.operation() != InstallerState::UNINSTALL);
@@ -1419,7 +1419,7 @@ void RefreshElevationPolicy() {
void AddOsUpgradeWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* install_list) {
const HKEY root_key = installer_state.root_key();
@@ -1452,7 +1452,7 @@ void AddOsUpgradeWorkItems(const InstallerState& installer_state,
void AddQueryEULAAcceptanceWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const base::Version& new_version,
+ const Version& new_version,
const Product& product,
WorkItemList* work_item_list) {
const HKEY root_key = installer_state.root_key();
« no previous file with comments | « chrome/installer/setup/install_unittest.cc ('k') | chrome/installer/setup/install_worker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698