cdesouza-chromium
07b587a892
This PR corrects several places where `BASE_FEATURE` is being used to rely on the two-arg variant of this macro. This particular PR has no functional changes, and the only feature declarations affected are the ones for which the feature-name constant, and the actual value are identical. The particular issue for this will be left open so subsequent work for the other features can be followed up on. Bug: https://github.com/brave/brave-browser/issues/50492
98 lines
3.7 KiB
Plaintext
98 lines
3.7 KiB
Plaintext
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
#include "brave/browser/brave_browser_main_parts_mac.h"
|
|
|
|
#include "base/feature_list.h"
|
|
#include "base/logging.h"
|
|
#include "brave/browser/mac/keystone_glue.h"
|
|
#include "brave/browser/sparkle_buildflags.h"
|
|
#include "brave/browser/updater/buildflags.h"
|
|
#include "brave/browser/upgrade_when_idle/upgrade_when_idle.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/common/channel_info.h"
|
|
#include "components/version_info/channel.h"
|
|
|
|
#if BUILDFLAG(ENABLE_SPARKLE)
|
|
#import "brave/browser/mac/sparkle_glue.h"
|
|
#endif
|
|
|
|
#if BUILDFLAG(ENABLE_OMAHA4)
|
|
#include "brave/browser/updater/features.h"
|
|
#endif
|
|
|
|
namespace brave {
|
|
BASE_FEATURE(kUpgradeWhenIdle,
|
|
base::FEATURE_DISABLED_BY_DEFAULT);
|
|
}
|
|
|
|
BraveBrowserMainPartsMac::BraveBrowserMainPartsMac(bool is_integration_test,
|
|
StartupData* startup_data)
|
|
: ChromeBrowserMainPartsMac(is_integration_test, startup_data) {}
|
|
|
|
BraveBrowserMainPartsMac::~BraveBrowserMainPartsMac() = default;
|
|
|
|
void BraveBrowserMainPartsMac::PreCreateMainMessageLoop() {
|
|
ChromeBrowserMainPartsMac::PreCreateMainMessageLoop();
|
|
|
|
bool use_omaha4 = false;
|
|
#if BUILDFLAG(ENABLE_OMAHA4)
|
|
use_omaha4 = brave_updater::ShouldUseOmaha4();
|
|
#endif
|
|
|
|
if (base::FeatureList::IsEnabled(brave::kUpgradeWhenIdle)) {
|
|
if (use_omaha4) {
|
|
upgrade_when_idle_ = std::make_unique<brave::UpgradeWhenIdle>(
|
|
// It's OK to pass profile_manager() here because it stays constant
|
|
// until we reset upgrade_when_idle_ in PostMainMessageLoopRun below.
|
|
g_browser_process->profile_manager());
|
|
} else {
|
|
// UpgradeWhenIdle restarts the browser with 0 open windows. It achieves
|
|
// this by adding the switch kNoStartupWindow to the command line.
|
|
// Unfortunately, this does not work with Sparkle, which drops all
|
|
// command-line arguments when it relaunches the browser to apply an
|
|
// update. We could work around this, for example by introducing a custom
|
|
// preference. However, Sparkle will be replaced by Omaha 4 soon. So it
|
|
// does not seem worth the effort.
|
|
VLOG(1) << "Feature UpgradeWhenIdle is enabled but cannot take effect "
|
|
"because Omaha 4 is not active.";
|
|
}
|
|
}
|
|
|
|
#if BUILDFLAG(ENABLE_SPARKLE)
|
|
if (!use_omaha4) {
|
|
// It would be a no-op if updates are disabled.
|
|
[[SparkleGlue sharedSparkleGlue] registerWithSparkle];
|
|
}
|
|
#endif // BUILDFLAG(ENABLE_SPARKLE)
|
|
}
|
|
|
|
void BraveBrowserMainPartsMac::PostProfileInit(Profile* profile,
|
|
bool is_initial_profile) {
|
|
ChromeBrowserMainPartsMac::PostProfileInit(profile, is_initial_profile);
|
|
|
|
if (!is_initial_profile) {
|
|
return;
|
|
}
|
|
|
|
// Activation of Keystone is not automatic but done in response to the
|
|
// counting and reporting of profiles.
|
|
KeystoneGlue* glue = [KeystoneGlue defaultKeystoneGlue];
|
|
if (glue && ![glue isRegisteredAndActive]) {
|
|
// If profile loading has failed, we still need to handle other tasks
|
|
// like marking of the product as active.
|
|
[glue setRegistrationActive];
|
|
}
|
|
}
|
|
|
|
void BraveBrowserMainPartsMac::PostMainMessageLoopRun() {
|
|
// This code runs before g_browser_process->profile_manager() is destroyed by
|
|
// BrowserProcessImpl::StartTearDown() in upstream's PostMainMessageLoopRun.
|
|
// upgrade_when_idle_ has a pointer to that profile manager and is no longer
|
|
// needed. We therefore reset it here to avoid a potential use-after-free.
|
|
upgrade_when_idle_.reset();
|
|
ChromeBrowserMainPartsMac::PostMainMessageLoopRun();
|
|
}
|