1- From 2fe2f16efd8fbf2f39126bc2d803b6f0fac48a68 Mon Sep 17 00:00:00 2001
1+ From f5b1c212b8aeb56c20b763623bf3973d91445ec4 Mon Sep 17 00:00:00 2001
22From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
33Date: Thu, 5 Aug 2021 02:09:34 +0200
44Subject: [PATCH] Patch installer to close previous browser instance on
55 system-level install
66
7+ Signed-off-by: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
78---
89 chrome/installer/setup/install_worker.cc | 48 ++++++++++++++++++++++++
910 1 file changed, 48 insertions(+)
1011
1112diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
12- index 6e3fba460233e..f2381bb1ae3db 100644
13+ index b87def50d9ece..0d6bbd526e659 100644
1314--- a/chrome/installer/setup/install_worker.cc
1415+++ b/chrome/installer/setup/install_worker.cc
15- @@ -23 ,6 +23 ,8 @@
16- #include "base/command_line .h"
16+ @@ -24 ,6 +24 ,8 @@
17+ #include "base/enterprise_util .h"
1718 #include "base/files/file_path.h"
1819 #include "base/files/file_util.h"
1920+ #include "base/process/kill.h"
2021+ #include "base/process/process_iterator.h"
2122 #include "base/logging.h"
2223 #include "base/metrics/histogram_functions.h"
2324 #include "base/strings/string_util.h"
24- @@ -59 ,6 +61 ,7 @@
25+ @@ -60 ,6 +62 ,7 @@
2526 #include "chrome/installer/util/shell_util.h"
2627 #include "chrome/installer/util/util_constants.h"
2728 #include "chrome/installer/util/work_item_list.h"
2829+ #include "content/public/common/result_codes.h"
2930
3031 #if BUILDFLAG(USE_GOOGLE_UPDATE_INTEGRATION)
3132 #include "chrome/installer/setup/channel_override_work_item.h"
32- @@ -213 ,6 +216 ,46 @@ void AddDeleteUninstallEntryForMSIWorkItems(
33+ @@ -218 ,6 +221 ,46 @@ void AddDeleteUninstallEntryForMSIWorkItems(
3334 delete_reg_key->set_best_effort(true);
3435 }
3536
@@ -76,7 +77,7 @@ index 6e3fba460233e..f2381bb1ae3db 100644
7677 // Adds Chrome specific install work items to |install_list|.
7778 void AddChromeWorkItems(const InstallParams& install_params,
7879 WorkItemList* install_list) {
79- @@ -225 ,6 +268 ,11 @@ void AddChromeWorkItems(const InstallParams& install_params,
80+ @@ -230 ,6 +273 ,11 @@ void AddChromeWorkItems(const InstallParams& install_params,
8081
8182 const base::FilePath& target_path = installer_state.target_path();
8283
@@ -89,5 +90,5 @@ index 6e3fba460233e..f2381bb1ae3db 100644
8990 // Delete the archive from an existing install to save some disk space.
9091 base::FilePath old_installer_dir(
9192- -
92- 2.30.2 .windows.1
93+ 2.35.1 .windows.2
9394
0 commit comments