Commit ee001616 authored by Paolo Amadini's avatar Paolo Amadini
Browse files

Bug 1532703 - Redirect "about:config" to the HTML version on all channels for...

Bug 1532703 - Redirect "about:config" to the HTML version on all channels for browser builds. r=mconley

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

--HG--
extra : moz-landing-system : lando
parent 56880b8b
......@@ -243,9 +243,6 @@ const ignorableWhitelist = new Set([
// Bug 1351669 - obsolete test file
"resource://gre/res/test.properties",
// Bug 1532703
"resource://app/localization/en-US/browser/aboutConfig.ftl",
]);
for (let entry of ignorableWhitelist) {
whitelist.add(entry);
......@@ -269,11 +266,6 @@ if (!isDevtools) {
}
}
if (!AppConstants.NIGHTLY_BUILD && !isDevtools) {
// Bug 1532703 - only used in HTML-based about:config
whitelist.add("chrome://browser/skin/toggle.svg");
}
if (AppConstants.MOZ_CODE_COVERAGE) {
whitelist.add("chrome://marionette/content/PerTestCoverageUtils.jsm");
}
......
......@@ -7,6 +7,7 @@
pages = [
'blocked',
'certerror',
'config',
'downloads',
'framecrashed',
'home',
......@@ -30,9 +31,6 @@ pages = [
'welcomeback',
]
if defined('NIGHTLY_BUILD'):
pages.append('config')
Classes = [
{
'cid': '{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980}',
......
......@@ -28,6 +28,7 @@ with Files('controlcenter/**'):
DIRS += [
'about',
'aboutconfig',
'aboutlogins',
'attribution',
'contextualidentity',
......@@ -62,7 +63,6 @@ DIRS += ['build']
if CONFIG['NIGHTLY_BUILD']:
DIRS += [
'aboutconfig',
'payments',
]
......
......@@ -8,10 +8,7 @@ const URL = "about:config";
add_task(async function setup() {
// Make sure that the field of which we restore the state is visible on load.
await SpecialPowers.pushPrefEnv({
set: [
["browser.aboutConfig.showWarning", false],
["general.warnOnAboutConfig", false],
],
set: [["browser.aboutConfig.showWarning", false]],
});
});
......@@ -75,10 +72,11 @@ add_task(async function test_set_tabstate_and_duplicate() {
"the tab's state was correctly restored"
);
let inputID = AppConstants.NIGHTLY_BUILD ? "about-config-search" : "textbox";
// add text data
await setInputValue(tab.linkedBrowser, { id: inputID, value: value3 });
await setInputValue(tab.linkedBrowser, {
id: "about-config-search",
value: value3,
});
// duplicate the tab
let tab2 = ss.duplicateTab(window, tab);
......@@ -90,7 +88,9 @@ add_task(async function test_set_tabstate_and_duplicate() {
tab2.linkedBrowser.currentURI.spec == URL,
"correctly duplicated the tab's state"
);
let textbox = await getInputValue(tab2.linkedBrowser, { id: inputID });
let textbox = await getInputValue(tab2.linkedBrowser, {
id: "about-config-search",
});
is(textbox, value3, "also duplicated text data");
// clean up
......
......@@ -67,7 +67,9 @@ static const RedirEntry kRedirMap[] = {
{"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT},
#ifndef MOZ_BUILD_APP_IS_BROWSER
{"config", "chrome://global/content/config.xul", 0},
#endif
#ifdef MOZ_CRASHREPORTER
{"crashes", "chrome://global/content/crashes.xhtml", 0},
#endif
......
......@@ -30,7 +30,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',
......
......@@ -212,7 +212,9 @@ pref("general.useragent.compatMode.firefox", false);
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);
......
......@@ -144,6 +144,9 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
if CONFIG['MOZ_SERVICES_SYNC']:
DEFINES['MOZ_SERVICES_SYNC'] = True
if CONFIG['MOZ_BUILD_APP'] == 'browser':
DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
if not CONFIG['MOZ_ANDROID_FAT_AAR_ARCHITECTURES']:
FINAL_TARGET_PP_FILES[CONFIG['ANDROID_CPU_ARCH']] += [
......
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