Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix writing promoCode file after Windows setup (uplift to 1.59.x) #20206

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Fix writing promoCode file after Windows setup (uplift to 1.59.x) #20206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions chromium_src/chrome/installer/setup/setup_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,24 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#define wWinMain wWinMain_ChromiumImpl
#include "src/chrome/installer/setup/setup_main.cc"
#undef wWinMain
#include <string>

#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/installer/setup/setup_util.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/util_constants.h"

namespace {

const char kBraveReferralCode[] = "brave-referral-code";

int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
wchar_t* command_line, int show_command) {
int return_code = wWinMain_ChromiumImpl(instance, prev_instance, command_line,
show_command);
if (!return_code) {
void SavePromoCode(installer::InstallStatus install_status) {
if (!InstallUtil::GetInstallReturnCode(install_status)) {
const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
if (cmd_line.HasSwitch(kBraveReferralCode)) {
const std::string referral_code =
Expand All @@ -30,6 +37,12 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
}
}
}

return return_code;
}

} // namespace

#define DoLegacyCleanups \
SavePromoCode(install_status); \
DoLegacyCleanups
#include "src/chrome/installer/setup/setup_main.cc"
#undef DoLegacyCleanups