Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1602463 Part 2 - Add a pref to enable/disable the default browser agent and reflect it to the registry where the agent can read it. r=agashlin,bytesized,nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D61892

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Molly Howell 2020-03-16 18:32:55 +00:00
parent 1ce92ca69d
commit e02dcdbd18
3 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/app/profile/firefox.js
View File

@ -2310,3 +2310,10 @@ pref("devtools.whatsnew.feature-enabled", true);
// FirstStartup service time-out in ms
pref("first-startup.timeout", 30000);
// Enable the default browser agent.
// The agent still runs as scheduled if this pref is disabled,
// but it exits immediately before taking any action.
#ifdef XP_WIN
pref("default-browser-agent.enabled", true);
#endif

3
toolkit/xre/moz.build
View File

@ -184,6 +184,9 @@ for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME',
'MOZ_WIDGET_TOOLKIT'):
DEFINES[var] = '"%s"' % CONFIG[var]
if CONFIG['MOZ_DEFAULT_BROWSER_AGENT'] == True and CONFIG['OS_ARCH'] == 'WINNT':
DEFINES['MOZ_DEFAULT_BROWSER_AGENT'] = True
if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
DEFINES['MOZ_UPDATER'] = True

61
toolkit/xre/nsAppRunner.cpp
View File

@ -110,6 +110,10 @@
# include "mozilla/LauncherRegistryInfo.h"
# endif
# if defined(MOZ_DEFAULT_BROWSER_AGENT)
# include "nsIWindowsRegKey.h"
# endif
# ifndef PROCESS_DEP_ENABLE
# define PROCESS_DEP_ENABLE 0x1
# endif
@ -244,10 +248,15 @@ extern void InstallSignalHandlers(const char* ProgramName);
#define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
#define FILE_STARTUP_INCOMPLETE NS_LITERAL_STRING(".startup-incomplete")
#if defined(MOZ_BLOCK_PROFILE_DOWNGRADE) || defined(MOZ_LAUNCHER_PROCESS)
#if defined(MOZ_BLOCK_PROFILE_DOWNGRADE) || defined(MOZ_LAUNCHER_PROCESS) || \
defined(MOZ_DEFAULT_BROWSER_AGENT)
static const char kPrefHealthReportUploadEnabled[] =
"datareporting.healthreport.uploadEnabled";
#endif // defined(MOZ_BLOCK_PROFILE_DOWNGRADE) || defined(MOZ_LAUNCHER_PROCESS)
// || defined(MOZ_DEFAULT_BROWSER_AGENT)
#if defined(MOZ_DEFAULT_BROWSER_AGENT)
static const char kPrefDefaultAgentEnabled[] = "default-browser-agent.enabled";
#endif // defined(MOZ_DEFAULT_BROWSER_AGENT)
int gArgc;
char** gArgv;
@ -1541,6 +1550,50 @@ static void SetupLauncherProcessPref() {
# endif // defined(MOZ_LAUNCHER_PROCESS)
# if defined(MOZ_DEFAULT_BROWSER_AGENT)
static void OnDefaultAgentTelemetryPrefChanged(const char* aPref, void* aData) {
bool prefVal = Preferences::GetBool(aPref, true);
nsresult rv;
nsCOMPtr<nsIWindowsRegKey> regKey =
do_CreateInstance("@mozilla.org/windows-registry-key;1", &rv);
NS_ENSURE_SUCCESS_VOID(rv);
nsAutoString keyName;
keyName.AppendLiteral("SOFTWARE\\" MOZ_APP_VENDOR "\\" MOZ_APP_NAME
"\\Default Browser Agent");
nsCOMPtr<nsIFile> binaryPath;
rv = XRE_GetBinaryPath(getter_AddRefs(binaryPath));
NS_ENSURE_SUCCESS_VOID(rv);
nsCOMPtr<nsIFile> binaryDir;
rv = binaryPath->GetParent(getter_AddRefs(binaryDir));
NS_ENSURE_SUCCESS_VOID(rv);
nsAutoString valueName;
rv = binaryDir->GetPath(valueName);
NS_ENSURE_SUCCESS_VOID(rv);
if (strcmp(aPref, kPrefHealthReportUploadEnabled) == 0) {
valueName.AppendLiteral("|DisableTelemetry");
} else if (strcmp(aPref, kPrefDefaultAgentEnabled) == 0) {
valueName.AppendLiteral("|DisableDefaultBrowserAgent");
} else {
return;
}
rv = regKey->Create(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER, keyName,
nsIWindowsRegKey::ACCESS_WRITE);
NS_ENSURE_SUCCESS_VOID(rv);
// We're recording whether the pref is *disabled*, so invert the value.
rv = regKey->WriteIntValue(valueName, prefVal ? 0 : 1);
NS_ENSURE_SUCCESS_VOID(rv);
}
# endif // defined(MOZ_DEFAULT_BROWSER_AGENT)
#endif // XP_WIN
void UnlockProfile() {
@ -4442,6 +4495,12 @@ nsresult XREMain::XRE_mainRun() {
# if defined(MOZ_LAUNCHER_PROCESS)
SetupLauncherProcessPref();
# endif // defined(MOZ_LAUNCHER_PROCESS)
# if defined(MOZ_DEFAULT_BROWSER_AGENT)
Preferences::RegisterCallbackAndCall(&OnDefaultAgentTelemetryPrefChanged,
kPrefHealthReportUploadEnabled);
Preferences::RegisterCallbackAndCall(&OnDefaultAgentTelemetryPrefChanged,
kPrefDefaultAgentEnabled);
# endif // defined(MOZ_DEFAULT_BROWSER_AGENT)
#endif
#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK)