wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 841087 - Stop unnecessary preprocessing in /browser/metro [r=sfoster]

Browse Source
This commit is contained in:
Matt Brubeck 2013-02-13 15:35:45 -08:00
parent d17d4ea78c
commit 9e103b1107
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
browser/metro/base/content/pages/aboutRights.xhtml
View File

@ -7,10 +7,10 @@
<!ENTITY % aboutRightsDTD SYSTEM "chrome://global/locale/aboutRights.dtd">
%aboutRightsDTD;
]>
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@ -26,9 +26,11 @@
<ul>
<li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
# Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
# Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
# Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace)
<!--
Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace)
-->
<li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
<li>&rights.intro-point2.5;</li>
<li>&rights2.intro-point3a;<a href="http://www.mozilla.com/legal/privacy/">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
@ -64,7 +66,7 @@
</div>
<ol>
# Terms only apply to official builds, unbranded builds get a placeholder.
<!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
<li>&rights2.webservices-term1;</li>
<li>&rights.webservices-term2;</li>
<li>&rights2.webservices-term3;</li>

24
browser/metro/base/jar.mn
View File

@ -8,16 +8,16 @@ chrome.jar:
% content browser %content/
content/aboutCertError.xhtml (content/pages/aboutCertError.xhtml)
* content/aboutRights.xhtml (content/pages/aboutRights.xhtml)
content/aboutRights.xhtml (content/pages/aboutRights.xhtml)
content/aboutCrash.xhtml (content/pages/aboutCrash.xhtml)
content/blockedSite.xhtml (content/pages/blockedSite.xhtml)
content/fullscreen-video.xhtml (content/pages/fullscreen-video.xhtml)
content/netError.xhtml (content/pages/netError.xhtml)
* content/bindings/bindings.xml (content/bindings/bindings.xml)
content/bindings/bindings.xml (content/bindings/bindings.xml)
content/bindings/tabs.xml (content/bindings/tabs.xml)
content/bindings/toggleswitch.xml (content/bindings/toggleswitch.xml)
* content/bindings/browser.xml (content/bindings/browser.xml)
content/bindings/browser.xml (content/bindings/browser.xml)
content/bindings/browser.js (content/bindings/browser.js)
content/bindings/downloads.xml (content/bindings/downloads.xml)
content/bindings/console.xml (content/bindings/console.xml)
@ -40,7 +40,7 @@ chrome.jar:
content/prompt/masterPassword.xul (content/prompt/masterPassword.xul)
content/prompt/removeMasterPassword.xul (content/prompt/removeMasterPassword.xul)
* content/helperui/AlertsHelper.js (content/helperui/AlertsHelper.js)
content/helperui/AlertsHelper.js (content/helperui/AlertsHelper.js)
content/helperui/CaptureDialog.js (content/helperui/CaptureDialog.js)
content/helperui/CapturePickerUI.js (content/helperui/CapturePickerUI.js)
content/helperui/CharsetMenu.js (content/helperui/CharsetMenu.js)
@ -61,18 +61,18 @@ chrome.jar:
content/contenthandlers/FindHandler.js (content/contenthandlers/FindHandler.js)
content/contenthandlers/ViewportHandler.js (content/contenthandlers/ViewportHandler.js)
content/contenthandlers/ConsoleAPIObserver.js (content/contenthandlers/ConsoleAPIObserver.js)
* content/contenthandlers/Content.js (content/contenthandlers/Content.js)
content/contenthandlers/Content.js (content/contenthandlers/Content.js)
content/BrowserTouchHandler.js (content/BrowserTouchHandler.js)
* content/WebProgress.js (content/WebProgress.js)
content/config.xul (content/config.xul)
content/config.js (content/config.js)
* content/browser.xul (content/browser.xul)
* content/browser.js (content/browser.js)
content/browser.js (content/browser.js)
* content/browser-ui.js (content/browser-ui.js)
* content/browser-scripts.js (content/browser-scripts.js)
* content/ContextCommands.js (content/ContextCommands.js)
* content/PageActions.js (content/PageActions.js)
content/ContextCommands.js (content/ContextCommands.js)
content/PageActions.js (content/PageActions.js)
content/commandUtil.js (content/commandUtil.js)
content/appbar.js (content/appbar.js)
content/shell.xul (content/jsshell/shell.xul)
@ -81,12 +81,12 @@ chrome.jar:
content/cursor.css (content/cursor.css)
% content branding %content/branding/
content/sanitize.js (content/sanitize.js)
* content/input.js (content/input.js)
* content/Util.js (content/Util.js)
content/input.js (content/input.js)
content/Util.js (content/Util.js)
content/bookmarks.js (content/bookmarks.js)
* content/preferences.js (content/preferences.js)
content/preferences.js (content/preferences.js)
content/exceptions.js (content/exceptions.js)
* content/downloads.js (content/downloads.js)
content/downloads.js (content/downloads.js)
content/history.js (content/history.js)
content/TopSites.js (content/TopSites.js)
content/console.js (content/console.js)

6
browser/metro/locales/jar.mn
View File

@ -24,7 +24,7 @@
@AB_CD@.jar:
% locale browser @AB_CD@ %locale/browser/
locale/browser/bookmarks.json (bookmarks.json)
* locale/browser/passwordmgr.properties (%overrides/passwordmgr.properties)
locale/browser/passwordmgr.properties (%overrides/passwordmgr.properties)
% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/passwordmgr.properties
#
@ -34,7 +34,7 @@
@AB_CD@.jar:
relativesrcdir browser/locales:
locale/browser/region.properties (%chrome/browser-region/region.properties)
* locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
* locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties)
locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties)
% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties