| Index: chrome/installer/setup/install_worker.cc
|
| diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
|
| index 3d10b4efd2fbbb8d65b4f8f2beb2c3debdf4c8e8..0e744e52520132b1ee567464a78c6419c5a42526 100644
|
| --- a/chrome/installer/setup/install_worker.cc
|
| +++ b/chrome/installer/setup/install_worker.cc
|
| @@ -82,8 +82,8 @@ void GetOldIELowRightsElevationPolicyKeyPath(base::string16* key_path) {
|
| // 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 Version* old_version,
|
| - const Version& new_version,
|
| + const base::Version* old_version,
|
| + const base::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;
|
| @@ -125,7 +125,7 @@ void AddInstallerCopyTasks(const InstallerState& installer_state,
|
| const base::FilePath& setup_path,
|
| const base::FilePath& archive_path,
|
| const base::FilePath& temp_path,
|
| - const Version& new_version,
|
| + const base::Version& new_version,
|
| WorkItemList* install_list) {
|
| DCHECK(install_list);
|
| base::FilePath installer_dir(
|
| @@ -228,8 +228,8 @@ void AddFirewallRulesWorkItems(const InstallerState& installer_state,
|
| void AddProductSpecificWorkItems(const InstallationState& original_state,
|
| const InstallerState& installer_state,
|
| const base::FilePath& setup_path,
|
| - const Version& new_version,
|
| - const Version* current_version,
|
| + const base::Version& new_version,
|
| + const base::Version* current_version,
|
| bool add_language_identifier,
|
| WorkItemList* list) {
|
| const Products& products = installer_state.products();
|
| @@ -285,8 +285,8 @@ void AddChromeWorkItems(const InstallationState& original_state,
|
| const base::FilePath& archive_path,
|
| const base::FilePath& src_path,
|
| const base::FilePath& temp_path,
|
| - const Version* current_version,
|
| - const Version& new_version,
|
| + const base::Version* current_version,
|
| + const base::Version& new_version,
|
| WorkItemList* install_list) {
|
| const base::FilePath& target_path = installer_state.target_path();
|
|
|
| @@ -412,7 +412,7 @@ void AddCleanupDelegateExecuteWorkItems(const InstallerState& installer_state,
|
| // state key if running under an MSI installer.
|
| void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
|
| const base::FilePath& setup_path,
|
| - const Version& new_version,
|
| + const base::Version& new_version,
|
| const Product& product,
|
| WorkItemList* install_list) {
|
| HKEY reg_root = installer_state.root_key();
|
| @@ -558,7 +558,7 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
|
| void AddVersionKeyWorkItems(HKEY root,
|
| const base::string16& version_key,
|
| const base::string16& product_name,
|
| - const Version& new_version,
|
| + const base::Version& new_version,
|
| bool add_language_identifier,
|
| WorkItemList* list) {
|
| list->AddCreateRegKeyWorkItem(root, version_key, KEY_WOW64_32KEY);
|
| @@ -895,8 +895,8 @@ void AddMigrateUsageStatesWorkItems(const InstallationState& original_state,
|
|
|
| bool AppendPostInstallTasks(const InstallerState& installer_state,
|
| const base::FilePath& setup_path,
|
| - const Version* current_version,
|
| - const Version& new_version,
|
| + const base::Version* current_version,
|
| + const base::Version& new_version,
|
| WorkItemList* post_install_task_list) {
|
| DCHECK(post_install_task_list);
|
|
|
| @@ -917,7 +917,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.
|
| - Version critical_version(installer_state.DetermineCriticalVersion(
|
| + base::Version critical_version(installer_state.DetermineCriticalVersion(
|
| current_version, new_version));
|
| base::FilePath installer_path(
|
| installer_state.GetInstallerDirectory(new_version).Append(
|
| @@ -1043,8 +1043,8 @@ void AddInstallWorkItems(const InstallationState& original_state,
|
| const base::FilePath& archive_path,
|
| const base::FilePath& src_path,
|
| const base::FilePath& temp_path,
|
| - const Version* current_version,
|
| - const Version& new_version,
|
| + const base::Version* current_version,
|
| + const base::Version& new_version,
|
| WorkItemList* install_list) {
|
| DCHECK(install_list);
|
|
|
| @@ -1202,7 +1202,7 @@ void AddCleanupDeprecatedPerUserRegistrationsWorkItems(const Product& product,
|
| }
|
|
|
| void AddActiveSetupWorkItems(const InstallerState& installer_state,
|
| - const Version& new_version,
|
| + const base::Version& new_version,
|
| const Product& product,
|
| WorkItemList* list) {
|
| DCHECK(installer_state.operation() != InstallerState::UNINSTALL);
|
| @@ -1316,7 +1316,7 @@ void RefreshElevationPolicy() {
|
|
|
| void AddOsUpgradeWorkItems(const InstallerState& installer_state,
|
| const base::FilePath& setup_path,
|
| - const Version& new_version,
|
| + const base::Version& new_version,
|
| const Product& product,
|
| WorkItemList* install_list) {
|
| const HKEY root_key = installer_state.root_key();
|
|
|