зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1731687 - Remove browser-doctype.inc. r=emalysz
Differential Revision: https://phabricator.services.mozilla.com/D127136
This commit is contained in:
Родитель
da1f9f11d1
Коммит
49c7deeea0
|
@ -8,12 +8,6 @@
|
||||||
<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
|
||||||
<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
|
||||||
|
|
||||||
<!DOCTYPE window [
|
|
||||||
#ifdef XP_MACOSX
|
|
||||||
#include browser-doctype.inc
|
|
||||||
#endif
|
|
||||||
]>
|
|
||||||
|
|
||||||
<window xmlns:html="http://www.w3.org/1999/xhtml"
|
<window xmlns:html="http://www.w3.org/1999/xhtml"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
id="aboutDialog"
|
id="aboutDialog"
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
|
|
||||||
%brandDTD;
|
|
|
@ -8,10 +8,6 @@
|
||||||
|
|
||||||
<?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
|
||||||
|
|
||||||
<!DOCTYPE window [
|
|
||||||
#include browser-doctype.inc
|
|
||||||
]>
|
|
||||||
|
|
||||||
<window id="main-window"
|
<window id="main-window"
|
||||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
# This include file should only contain things that are needed to support MacOS
|
# This include file should only contain things that are needed to support MacOS
|
||||||
# specific features that are needed for all top level windows. If the feature is
|
# specific features that are needed for all top level windows. If the feature is
|
||||||
# also needed in browser.xhtml, it should go in one of the various include files
|
# also needed in browser.xhtml, it should go in one of the various include files
|
||||||
# below that are shared with browser.xhtml. When including this file,
|
# below that are shared with browser.xhtml.
|
||||||
# browser-doctype.inc must also be included.
|
|
||||||
|
|
||||||
<linkset>
|
<linkset>
|
||||||
<html:link rel="localization" href="branding/brand.ftl"/>
|
<html:link rel="localization" href="branding/brand.ftl"/>
|
||||||
|
|
|
@ -6,12 +6,6 @@
|
||||||
<?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
|
||||||
<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
|
||||||
|
|
||||||
<!DOCTYPE window [
|
|
||||||
#ifdef XP_MACOSX
|
|
||||||
#include ../browser-doctype.inc
|
|
||||||
#endif
|
|
||||||
]>
|
|
||||||
|
|
||||||
<window id="main-window"
|
<window id="main-window"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||||
|
|
|
@ -17,9 +17,6 @@
|
||||||
<!DOCTYPE window [
|
<!DOCTYPE window [
|
||||||
<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
|
<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
|
||||||
%editMenuOverlayDTD;
|
%editMenuOverlayDTD;
|
||||||
#ifdef XP_MACOSX
|
|
||||||
#include ../../../base/content/browser-doctype.inc
|
|
||||||
#endif
|
|
||||||
]>
|
]>
|
||||||
|
|
||||||
<window id="places"
|
<window id="places"
|
||||||
|
|
|
@ -7,13 +7,6 @@
|
||||||
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
|
||||||
<?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
|
<?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
|
||||||
|
|
||||||
|
|
||||||
<!DOCTYPE dialog [
|
|
||||||
#ifdef XP_MACOSX
|
|
||||||
#include ../../../base/content/browser-doctype.inc
|
|
||||||
#endif
|
|
||||||
]>
|
|
||||||
|
|
||||||
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||||
windowtype="Shell:SetDesktopBackground"
|
windowtype="Shell:SetDesktopBackground"
|
||||||
|
|
|
@ -9,12 +9,6 @@
|
||||||
<?xml-stylesheet href="chrome://global/skin/global.css"?>
|
<?xml-stylesheet href="chrome://global/skin/global.css"?>
|
||||||
<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
|
<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
|
||||||
|
|
||||||
<!DOCTYPE window [
|
|
||||||
#if defined(XP_MACOSX) && MOZ_BUILD_APP == browser
|
|
||||||
#include ../../../../browser/base/content/browser-doctype.inc
|
|
||||||
#endif
|
|
||||||
]>
|
|
||||||
|
|
||||||
<window windowtype="Update:Elevation"
|
<window windowtype="Update:Elevation"
|
||||||
type="child"
|
type="child"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче