Bug 1543468 - Stop using toolkit netError.css URL on Android. r=JanH

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tim Nguyen 2019-04-10 19:32:20 +00:00
Родитель a8c9fd6a83
Коммит 5fbe70260e
4 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -20,7 +20,7 @@
<head> <head>
<title>&certerror.pagetitle;</title> <title>&certerror.pagetitle;</title>
<meta name="viewport" content="width=device-width; user-scalable=false" /> <meta name="viewport" content="width=device-width; user-scalable=false" />
<link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" /> <link rel="stylesheet" href="chrome://browser/skin/netError.css" media="all" />
<!-- This page currently uses the same favicon as neterror.xhtml. <!-- This page currently uses the same favicon as neterror.xhtml.
If the location of the favicon is changed for both pages, the If the location of the favicon is changed for both pages, the
FAVICON_ERRORPAGE_URL symbol in toolkit/components/places/src/nsFaviconService.h FAVICON_ERRORPAGE_URL symbol in toolkit/components/places/src/nsFaviconService.h

Просмотреть файл

@ -18,7 +18,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta name="viewport" content="width=device-width; user-scalable=false" /> <meta name="viewport" content="width=device-width; user-scalable=false" />
<link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" /> <link rel="stylesheet" href="chrome://browser/skin/netError.css" media="all" />
<link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/blocked-warning.png"/> <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/blocked-warning.png"/>
<script type="application/javascript"><![CDATA[ <script type="application/javascript"><![CDATA[

Просмотреть файл

@ -21,7 +21,7 @@
<head> <head>
<meta name="viewport" content="width=device-width; user-scalable=false;" /> <meta name="viewport" content="width=device-width; user-scalable=false;" />
<title>&loadError.label;</title> <title>&loadError.label;</title>
<link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" /> <link rel="stylesheet" href="chrome://browser/skin/netError.css" media="all" />
<!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
toolkit/components/places/src/nsFaviconService.h should be updated. --> toolkit/components/places/src/nsFaviconService.h should be updated. -->
<link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/errorpage-warning.png"/> <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://browser/skin/images/errorpage-warning.png"/>

Просмотреть файл

@ -17,7 +17,6 @@ chrome.jar:
skin/netError.css (netError.css) skin/netError.css (netError.css)
skin/spinner.css (spinner.css) skin/spinner.css (spinner.css)
% override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css % override chrome://global/skin/aboutReader.css chrome://browser/skin/aboutReader.css
% override chrome://global/skin/netError.css chrome://browser/skin/netError.css
skin/aboutLogins.css (aboutLogins.css) skin/aboutLogins.css (aboutLogins.css)