Skip to content
Snippets Groups Projects
Verified Commit b27d2320 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

fixup! Bug 10760: Integrate TorButton to TorBrowser core

Remove string changes from Torbutton.
We will add them back in the TorStrings commit.
parent 9cd44b23
No related branches found
No related tags found
1 merge request!632Bug 41741: Refactor the domain isolator and new circuit
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">
%torbuttonDTD;
<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd">
%aboutTorDTD;
<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd">
%aboutDialogDTD;
......@@ -8,10 +8,6 @@
<?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
<!DOCTYPE window [
#include browser-doctype.inc
]>
<window id="main-window"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
......
......@@ -6,12 +6,6 @@
<?xml-stylesheet href="chrome://browser/content/pageinfo/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"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
......
......@@ -18,9 +18,6 @@
<!DOCTYPE window [
<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
%editMenuOverlayDTD;
#ifdef XP_MACOSX
#include ../../../base/content/browser-doctype.inc
#endif
]>
<window id="places"
......
......@@ -7,12 +7,6 @@
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
<!DOCTYPE window [
#ifdef XP_MACOSX
#include ../../../base/content/browser-doctype.inc
#endif
]>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
windowtype="Shell:SetDesktopBackground"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment