Skip to content

Commit

Permalink
Uplift of #21478 (squashed) to beta
Browse files Browse the repository at this point in the history
  • Loading branch information
brave-builds committed Jan 3, 2024
1 parent be1405d commit 0fb143a
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions chromium_src/chrome/installer/setup/uninstall.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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

0 comments on commit 0fb143a

Please sign in to comment.