Commit 61215d44 authored by Sorin Jianu's avatar Sorin Jianu Committed by Commit Bot

Make the Windows updater instance active when run with --install.

Bug: 1109231
Change-Id: I5bfe32fdf39c703bae75e393aa295355094cec31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2341180Reviewed-by: default avatarS. Ganesh <ganesh@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795709}
parent 6e6408a4
...@@ -679,12 +679,15 @@ class AppInstall : public App { ...@@ -679,12 +679,15 @@ class AppInstall : public App {
private: private:
~AppInstall() override = default; ~AppInstall() override = default;
// Overrides for App.
void Initialize() override; void Initialize() override;
void Uninitialize() override; void Uninitialize() override;
void FirstTaskRun() override; void FirstTaskRun() override;
void SetupDone(int result); void SetupDone(int result);
std::unique_ptr<LocalPrefs> local_prefs_;
scoped_refptr<Configurator> config_; scoped_refptr<Configurator> config_;
scoped_refptr<AppInstallController> app_install_controller_; scoped_refptr<AppInstallController> app_install_controller_;
...@@ -695,10 +698,12 @@ class AppInstall : public App { ...@@ -695,10 +698,12 @@ class AppInstall : public App {
void AppInstall::Initialize() { void AppInstall::Initialize() {
base::i18n::InitializeICU(); base::i18n::InitializeICU();
local_prefs_ = CreateLocalPrefs();
config_ = base::MakeRefCounted<Configurator>(CreateGlobalPrefs()); config_ = base::MakeRefCounted<Configurator>(CreateGlobalPrefs());
} }
void AppInstall::Uninitialize() { void AppInstall::Uninitialize() {
PrefsCommitPendingWrites(local_prefs_->GetPrefService());
PrefsCommitPendingWrites(config_->GetPrefService()); PrefsCommitPendingWrites(config_->GetPrefService());
} }
...@@ -729,6 +734,11 @@ void AppInstall::SetupDone(int result) { ...@@ -729,6 +734,11 @@ void AppInstall::SetupDone(int result) {
return; return;
} }
// TODO(crbug.com/1109231) - this is a temporary workaround until a better
// fix is found. For now, promote this updater instance and make it active
// when it is invoked with --install.
local_prefs_->SetQualified(true);
base::MakeRefCounted<PersistedData>(config_->GetPrefService()) base::MakeRefCounted<PersistedData>(config_->GetPrefService())
->SetProductVersion(kUpdaterAppId, base::Version(UPDATER_VERSION_STRING)); ->SetProductVersion(kUpdaterAppId, base::Version(UPDATER_VERSION_STRING));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment