Commit 289bde69 authored by Paolo Amadini's avatar Paolo Amadini
Browse files

Bug 1523907 - Fix building the new "about:config" page on release channels. r=mak

Differential Revision: https://phabricator.services.mozilla.com/D18082

--HG--
extra : rebase_source : 7094aa1a5dbfc33d7b77a387f12eb14cff66d9e9
parent 0ebf7396
......@@ -509,9 +509,6 @@ pref("browser.bookmarks.openInTabClosesMenu", true);
// Scripts & Windows prefs
pref("dom.disable_open_during_load", true);
pref("javascript.options.showInConsole", true);
#ifdef DEBUG
pref("general.warnOnAboutConfig", false);
#endif
// This is the pref to control the location bar, change this to true to
// force this - this makes the origin of popup windows more obvious to avoid
......@@ -1814,10 +1811,7 @@ pref("browser.discovery.sites", "addons.mozilla.org");
pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
// Show the warning page for the new about config. Will replace general.warnOnAboutConfig.
#ifdef NIGHTLY_BUILD
pref("browser.aboutConfig.showWarning", true);
#endif
#if defined(XP_WIN) && defined(MOZ_LAUNCHER_PROCESS)
// Launcher process is disabled by default, will be selectively enabled via SHIELD
......
......@@ -31,6 +31,7 @@ with Files('controlcenter/**'):
DIRS += [
'about',
'aboutconfig',
'attribution',
'contextualidentity',
'customizableui',
......@@ -61,7 +62,6 @@ DIRS += ['build']
if CONFIG['NIGHTLY_BUILD']:
DIRS += [
'aboutconfig',
'payments',
]
......
......@@ -72,7 +72,7 @@ static const RedirEntry kRedirMap[] = {
{"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
#if !defined(NIGHTLY_BUILD) || !defined(MOZ_BUILD_APP_IS_BROWSER)
#ifndef MOZ_BUILD_APP_IS_BROWSER
{"config", "chrome://global/content/config.xul", 0},
#endif
#ifdef MOZ_CRASHREPORTER
......
......@@ -29,7 +29,7 @@ about_pages = [
'webrtc',
]
if not defined('NIGHTLY_BUILD') or buildconfig.substs['MOZ_BUILD_APP'] != 'browser':
if buildconfig.substs['MOZ_BUILD_APP'] != 'browser':
about_pages.append('config')
if defined('MOZ_CRASHREPORTER'):
about_pages.append('crashes')
......
......@@ -7,6 +7,9 @@
with Files('**'):
BUG_COMPONENT = ('Core', 'Document Navigation')
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
DIRS += [
'base',
'shistory',
......
......@@ -23,7 +23,9 @@ pref("general.useragent.site_specific_overrides", true);
pref("general.config.obscure_value", 13); // for MCD .cfg files
#ifndef MOZ_BUILD_APP_IS_BROWSER
pref("general.warnOnAboutConfig", true);
#endif
// maximum number of dated backups to keep at any time
pref("browser.bookmarks.max_backups", 5);
......
......@@ -49,6 +49,9 @@ if CONFIG['NIGHTLY_BUILD']:
DEFINES['ENABLE_WASM_REFTYPES'] = True
DEFINES['ENABLE_WASM_GC'] = True
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
FINAL_TARGET_PP_FILES += [
'greprefs.js',
]
......@@ -938,6 +938,7 @@ class RunProgram(MachCommandBase):
all(p not in params for p in ['-profile', '--profile', '-P'])
if no_profile_option_given and not noprofile:
prefs = {
'browser.aboutConfig.showWarning': False,
'browser.shell.checkDefaultBrowser': False,
'general.warnOnAboutConfig': False,
}
......
......@@ -125,7 +125,7 @@ def test_ini_keep_case(compare_generated):
"""
# write the .ini file
_ini = """[DEFAULT]
general.warnOnAboutConfig = False
network.dns.disableIPv6 = True
"""
try:
fd, name = tempfile.mkstemp(suffix='.ini', text=True)
......@@ -134,7 +134,7 @@ general.warnOnAboutConfig = False
commandline = ["--preferences", name]
# test the [DEFAULT] section
_prefs = {'general.warnOnAboutConfig': 'False'}
_prefs = {'network.dns.disableIPv6': 'True'}
compare_generated(_prefs, commandline)
finally:
......
Supports Markdown
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