Uplift of #21478 (squashed) to release

brave · Jan 3, 2024 · 1150c17 · 1150c17
1 parent e943a1f
commit 1150c17
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/chromium_src/chrome/installer/setup/uninstall.cc b/chromium_src/chrome/installer/setup/uninstall.cc
@@ -69,6 +69,14 @@ InstallStatus UninstallProduct(const ModifyParams& modify_params,
                                bool remove_all,
                                bool force_uninstall,
                                const base::CommandLine& cmd_line) {
+  InstallStatus ret = UninstallProduct_ChromiumImpl(modify_params, remove_all,
+                                                    force_uninstall, cmd_line);
+
+  // Early return if user cancelled.
+  if (ret == installer::UNINSTALL_CANCELLED) {
+    return ret;
+  }
+
   DeleteBraveFileKeys(HKEY_CURRENT_USER);
 
   const auto installer_state = modify_params.installer_state;
@@ -100,8 +108,8 @@ InstallStatus UninstallProduct(const ModifyParams& modify_params,
   }
   brave_vpn::ras::RemoveEntry(brave_vpn::GetBraveVPNConnectionName());
 #endif
-  return UninstallProduct_ChromiumImpl(modify_params, remove_all,
-                                       force_uninstall, cmd_line);
+
+  return ret;
 }
 
 }  // namespace installer