| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #if defined(GOOGLE_CHROME_BUILD) | 5 #if defined(GOOGLE_CHROME_BUILD) |
| 6 | 6 |
| 7 #include "chrome/installer/setup/app_launcher_installer.h" | 7 #include "chrome/installer/setup/app_launcher_installer.h" |
| 8 | 8 |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/version.h" | 10 #include "base/version.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 // install or update. | 47 // install or update. |
| 48 auto* delete_reg_key_work_item = list->AddDeleteRegKeyWorkItem( | 48 auto* delete_reg_key_work_item = list->AddDeleteRegKeyWorkItem( |
| 49 installer_state.root_key(), GetRegistrationDataCommandKey(reg_data, name), | 49 installer_state.root_key(), GetRegistrationDataCommandKey(reg_data, name), |
| 50 KEY_WOW64_32KEY); | 50 KEY_WOW64_32KEY); |
| 51 delete_reg_key_work_item->set_best_effort(true); | 51 delete_reg_key_work_item->set_best_effort(true); |
| 52 delete_reg_key_work_item->set_rollback_enabled(false); | 52 delete_reg_key_work_item->set_rollback_enabled(false); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace | 55 } // namespace |
| 56 | 56 |
| 57 void AddAppLauncherVersionKeyWorkItems(HKEY root, | |
| 58 const base::Version& new_version, | |
| 59 bool add_language_identifier, | |
| 60 WorkItemList* list) { | |
| 61 DCHECK(!InstallUtil::IsChromeSxSProcess()); | |
| 62 const UpdatingAppRegistrationData app_launcher_reg_data(kAppLauncherGuid); | |
| 63 AddVersionKeyWorkItems(root, | |
| 64 app_launcher_reg_data.GetVersionKey(), | |
| 65 GetAppLauncherDisplayName(), | |
| 66 new_version, | |
| 67 add_language_identifier, | |
| 68 list); | |
| 69 } | |
| 70 | |
| 71 void RemoveAppLauncherVersionKey(HKEY reg_root) { | 57 void RemoveAppLauncherVersionKey(HKEY reg_root) { |
| 72 DCHECK(!InstallUtil::IsChromeSxSProcess()); | 58 DCHECK(!InstallUtil::IsChromeSxSProcess()); |
| 73 const UpdatingAppRegistrationData app_launcher_reg_data(kAppLauncherGuid); | 59 const UpdatingAppRegistrationData app_launcher_reg_data(kAppLauncherGuid); |
| 74 InstallUtil::DeleteRegistryKey( | 60 InstallUtil::DeleteRegistryKey( |
| 75 reg_root, app_launcher_reg_data.GetVersionKey(), KEY_WOW64_32KEY); | 61 reg_root, app_launcher_reg_data.GetVersionKey(), KEY_WOW64_32KEY); |
| 76 } | 62 } |
| 77 | 63 |
| 78 void AddRemoveLegacyAppHostExeWorkItems(const base::FilePath& target_path, | 64 void AddRemoveLegacyAppHostExeWorkItems(const base::FilePath& target_path, |
| 79 const base::FilePath& temp_path, | 65 const base::FilePath& temp_path, |
| 80 WorkItemList* list) { | 66 WorkItemList* list) { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 111 // Remove "quick-enable-application-host" command from Binaries. | 97 // Remove "quick-enable-application-host" command from Binaries. |
| 112 AddLegacyAppCommandRemovalItem(installer_state, binaries_reg_data, | 98 AddLegacyAppCommandRemovalItem(installer_state, binaries_reg_data, |
| 113 kLegacyCmdQuickEnableApplicationHost, list); | 99 kLegacyCmdQuickEnableApplicationHost, list); |
| 114 } | 100 } |
| 115 } | 101 } |
| 116 } | 102 } |
| 117 | 103 |
| 118 } // namespace installer | 104 } // namespace installer |
| 119 | 105 |
| 120 #endif // GOOGLE_CHROME_BUILD | 106 #endif // GOOGLE_CHROME_BUILD |
| OLD | NEW |