Commit e4574c7a authored by Magnus Melin's avatar Magnus Melin
Browse files

Bug 1524836 - Move new HTML about:config page from browser to toolkit....

Bug 1524836 - Move new HTML about:config page from browser to toolkit. r=fluent-reviewers,preferences-reviewers,geckoview-reviewers,Gijs,agi

Unbitrot and change strategy for geckoview: now map about:config directly in nsAboutRecirector.cpp

Differential Revision: https://phabricator.services.mozilla.com/D25938
parent 723d17bb
......@@ -43,6 +43,9 @@ struct RedirEntry {
unless your about: page really needs chrome privileges. Security review is
required before adding new map entries without
URI_SAFE_FOR_UNTRUSTED_CONTENT.
NOTE: changes to this redir map need to be accompanied with changes to
browser/components/about/components.conf
*/
static const RedirEntry kRedirMap[] = {
{"blocked", "chrome://browser/content/blockedSite.xhtml",
......@@ -53,7 +56,6 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT},
{"config", "chrome://browser/content/aboutconfig/aboutconfig.html", 0},
{"framecrashed", "chrome://browser/content/aboutFrameCrashed.html",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::HIDE_FROM_ABOUTABOUT},
......
......@@ -7,7 +7,6 @@
pages = [
'blocked',
'certerror',
'config',
'downloads',
'framecrashed',
'home',
......
......@@ -6,7 +6,7 @@
-moz-context-properties: fill, fill-opacity;
fill: currentColor;
fill-opacity: 0.4;
background-image: url("chrome://browser/skin/search-glass.svg");
background-image: url("chrome://global/skin/icons/search-glass.svg");
background-position: 8px center;
background-repeat: no-repeat;
background-size: 16px;
......
......@@ -131,7 +131,7 @@ input[type="url"]:read-only {
}
.edit-button {
background-image: url("chrome://browser/skin/edit.svg");
background-image: url("chrome://global/skin/icons/edit.svg");
padding-inline-start: 32px; /* 8px on each side, and 16px for icon width */
}
......
......@@ -12,7 +12,7 @@ function confirmDefaults() {
} else {
is(
getComputedStyle(document.getElementById("identity-icon")).listStyleImage,
'url("chrome://browser/skin/search-glass.svg")',
'url("chrome://global/skin/icons/search-glass.svg")',
"Identity icon should be the search icon"
);
}
......
......@@ -28,7 +28,6 @@ with Files("controlcenter/**"):
DIRS += [
"about",
"aboutconfig",
"aboutlogins",
"attribution",
"contextualidentity",
......
......@@ -47,7 +47,7 @@
}
&.icon-search {
background-image: url('chrome://browser/skin/search-glass.svg');
background-image: url('chrome://global/skin/icons/search-glass.svg');
}
&.icon-modal-delete {
......
......@@ -209,7 +209,7 @@ body {
.icon.icon-delete {
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg"); }
.icon.icon-search {
background-image: url("chrome://browser/skin/search-glass.svg"); }
background-image: url("chrome://global/skin/icons/search-glass.svg"); }
.icon.icon-modal-delete {
flex-shrink: 0;
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-modal-delete-32.svg");
......
......@@ -212,7 +212,7 @@ body {
.icon.icon-delete {
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg"); }
.icon.icon-search {
background-image: url("chrome://browser/skin/search-glass.svg"); }
background-image: url("chrome://global/skin/icons/search-glass.svg"); }
.icon.icon-modal-delete {
flex-shrink: 0;
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-modal-delete-32.svg");
......
......@@ -209,7 +209,7 @@ body {
.icon.icon-delete {
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-delete-16.svg"); }
.icon.icon-search {
background-image: url("chrome://browser/skin/search-glass.svg"); }
background-image: url("chrome://global/skin/icons/search-glass.svg"); }
.icon.icon-modal-delete {
flex-shrink: 0;
background-image: url("chrome://activity-stream/content/data/content/assets/glyph-modal-delete-32.svg");
......
......@@ -20,7 +20,7 @@ const PREFS_BEFORE_SECTIONS = [
feed: "showSearch",
titleString: "home-prefs-search-header",
},
icon: "chrome://browser/skin/search-glass.svg",
icon: "chrome://global/skin/icons/search-glass.svg",
},
{
id: "topsites",
......
......@@ -45,7 +45,7 @@ ContentSearchHandoffUIController.prototype = {
// We only show the engines icon for app provided engines, otherwise show
// a default. xref https://bugzilla.mozilla.org/show_bug.cgi?id=1449338#c19
if (!engine.isAppProvided) {
this._engineIcon = "chrome://browser/skin/search-glass.svg";
this._engineIcon = "chrome://global/skin/icons/search-glass.svg";
} else if (engine.iconData) {
this._engineIcon = this._getFaviconURIFromIconData(engine.iconData);
} else {
......
......@@ -691,7 +691,7 @@ this.ContentSearchUIController = (function() {
// a default. xref https://bugzilla.mozilla.org/show_bug.cgi?id=1449338#c19
let icon = this.defaultEngine.isAppProvided
? this.defaultEngine.icon
: "chrome://browser/skin/search-glass.svg";
: "chrome://global/skin/icons/search-glass.svg";
document.body.style.setProperty(
"--newtab-search-icon",
......
......@@ -64,7 +64,7 @@ async function runNewTabTest() {
// We only show the engine's own icon for app provided engines, otherwise show
// a default. xref https://bugzilla.mozilla.org/show_bug.cgi?id=1449338#c19
await ensureIcon(tab, "chrome://browser/skin/search-glass.svg");
await ensureIcon(tab, "chrome://global/skin/icons/search-glass.svg");
await Services.search.setDefault(defaultEngine);
......@@ -102,7 +102,7 @@ add_task(async function test_content_search_icon_in_private_window() {
// We only show the engine's own icon for app provided engines, otherwise show
// a default. xref https://bugzilla.mozilla.org/show_bug.cgi?id=1449338#c19
await ensureIcon(tab, "chrome://browser/skin/search-glass.svg");
await ensureIcon(tab, "chrome://global/skin/icons/search-glass.svg");
await Services.search.setDefault(defaultEngine);
......
......@@ -114,13 +114,13 @@ var gBuiltInInputs = {
},
Find: {
title: "find",
image: "chrome://browser/skin/search-glass.svg",
image: "chrome://global/skin/icons/search-glass.svg",
type: kInputTypes.BUTTON,
callback: () => execCommand("cmd_find"),
},
NewTab: {
title: "new-tab",
image: "chrome://browser/skin/add.svg",
image: "chrome://global/skin/icons/add.svg",
type: kInputTypes.BUTTON,
callback: () => execCommand("cmd_newNavigatorTabNoEvent"),
},
......@@ -149,7 +149,7 @@ var gBuiltInInputs = {
OpenLocation: {
key: "open-location",
title: "open-location",
image: "chrome://browser/skin/search-glass.svg",
image: "chrome://global/skin/icons/search-glass.svg",
type: kInputTypes.MAIN_BUTTON,
callback: () => execCommand("Browser:OpenLocation"),
},
......@@ -164,7 +164,7 @@ var gBuiltInInputs = {
},
SearchPopover: {
title: "search-popover",
image: "chrome://browser/skin/search-glass.svg",
image: "chrome://global/skin/icons/search-glass.svg",
type: kInputTypes.POPOVER,
children: {
SearchScrollViewLabel: {
......@@ -437,7 +437,7 @@ class TouchBarHelper {
} else {
gBuiltInInputs.OpenLocation.title = "open-location";
gBuiltInInputs.OpenLocation.image =
"chrome://browser/skin/search-glass.svg";
"chrome://global/skin/icons/search-glass.svg";
gBuiltInInputs.OpenLocation.callback = () =>
execCommand("Browser:OpenLocation", "OpenLocation");
}
......
......@@ -181,7 +181,7 @@ The search popover
SearchPopover: {
title: "search-popover",
image: "chrome://browser/skin/search-glass.svg",
image: "chrome://global/skin/icons/search-glass.svg",
type: kInputTypes.POPOVER,
children: {
SearchScrollViewLabel: {
......
......@@ -3,7 +3,7 @@
[browser_touchbar_searchrestrictions.js]
skip-if = os != "mac"
[browser_touchbar_tests.js]
skip-if = os != "mac"
skip-if = os != "mac" || verify # Bug 1611300
support-files =
readerModeArticle.html
test-video.mp4
......
......@@ -94,7 +94,7 @@ add_task(async function updateReaderView() {
add_task(async function updateMainButtonInFullscreen() {
Assert.equal(
TouchBarHelper.getTouchBarInput("OpenLocation").image.spec,
"chrome://browser/skin/search-glass.svg",
"chrome://global/skin/icons/search-glass.svg",
"OpenLocation should be displaying the search glass icon."
);
BrowserTestUtils.loadURI(
......@@ -118,7 +118,7 @@ add_task(async function updateMainButtonInFullscreen() {
await exited;
Assert.equal(
TouchBarHelper.getTouchBarInput("OpenLocation").image.spec,
"chrome://browser/skin/search-glass.svg",
"chrome://global/skin/icons/search-glass.svg",
"OpenLocation should be displaying the search glass icon."
);
});
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Article title</title>
<meta name="description" content="This is the article description." />
</head>
......
......@@ -135,7 +135,7 @@ var UrlbarUtils = {
// DEFAULT is defined lazily so it doesn't eagerly initialize PlacesUtils.
EXTENSION: "chrome://browser/content/extension.svg",
HISTORY: "chrome://browser/skin/history.svg",
SEARCH_GLASS: "chrome://browser/skin/search-glass.svg",
SEARCH_GLASS: "chrome://global/skin/icons/search-glass.svg",
SEARCH_GLASS_INVERTED: "chrome://browser/skin/search-glass-inverted.svg",
TIP: "chrome://browser/skin/tip.svg",
},
......
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