browser/base/jar.mn@b8a032363ba2 (annotated)
browser/base/jar.mn
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | # This Source Code Form is subject to the terms of the Mozilla Public |
| michael@0 | 2 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
| michael@0 | 3 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
| michael@0 | 4 | browser.jar: |
| michael@0 | 5 | % content browser %content/browser/ contentaccessible=yes |
| michael@0 | 6 | #ifdef XP_MACOSX |
| michael@0 | 7 | % overlay chrome://mozapps/content/downloads/downloads.xul chrome://browser/content/downloadManagerOverlay.xul |
| michael@0 | 8 | % overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul |
| michael@0 | 9 | % overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul |
| michael@0 | 10 | #endif |
| michael@0 | 11 | #ifdef XP_WIN |
| michael@0 | 12 | % overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6 |
| michael@0 | 13 | #endif |
| michael@0 | 14 | % overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul |
| michael@0 | 15 | % overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul |
| michael@0 | 16 | |
| michael@0 | 17 | * content/browser/aboutDialog.xul (content/aboutDialog.xul) |
| michael@0 | 18 | * content/browser/aboutDialog.js (content/aboutDialog.js) |
| michael@0 | 19 | content/browser/aboutDialog.css (content/aboutDialog.css) |
| michael@0 | 20 | content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) |
| michael@0 | 21 | content/browser/abouthome/aboutHome.xhtml (content/abouthome/aboutHome.xhtml) |
| michael@0 | 22 | content/browser/abouthome/aboutHome.js (content/abouthome/aboutHome.js) |
| michael@0 | 23 | * content/browser/abouthome/aboutHome.css (content/abouthome/aboutHome.css) |
| michael@0 | 24 | content/browser/abouthome/snippet1.png (content/abouthome/snippet1.png) |
| michael@0 | 25 | content/browser/abouthome/snippet2.png (content/abouthome/snippet2.png) |
| michael@0 | 26 | content/browser/abouthome/downloads.png (content/abouthome/downloads.png) |
| michael@0 | 27 | content/browser/abouthome/bookmarks.png (content/abouthome/bookmarks.png) |
| michael@0 | 28 | content/browser/abouthome/history.png (content/abouthome/history.png) |
| michael@0 | 29 | content/browser/abouthome/apps.png (content/abouthome/apps.png) |
| michael@0 | 30 | content/browser/abouthome/addons.png (content/abouthome/addons.png) |
| michael@0 | 31 | content/browser/abouthome/sync.png (content/abouthome/sync.png) |
| michael@0 | 32 | content/browser/abouthome/settings.png (content/abouthome/settings.png) |
| michael@0 | 33 | content/browser/abouthome/restore.png (content/abouthome/restore.png) |
| michael@0 | 34 | content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) |
| michael@0 | 35 | content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) |
| michael@0 | 36 | content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) |
| michael@0 | 37 | content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) |
| michael@0 | 38 | content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) |
| michael@0 | 39 | content/browser/abouthome/bookmarks@2x.png (content/abouthome/bookmarks@2x.png) |
| michael@0 | 40 | content/browser/abouthome/history@2x.png (content/abouthome/history@2x.png) |
| michael@0 | 41 | content/browser/abouthome/apps@2x.png (content/abouthome/apps@2x.png) |
| michael@0 | 42 | content/browser/abouthome/addons@2x.png (content/abouthome/addons@2x.png) |
| michael@0 | 43 | content/browser/abouthome/sync@2x.png (content/abouthome/sync@2x.png) |
| michael@0 | 44 | content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) |
| michael@0 | 45 | content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) |
| michael@0 | 46 | content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) |
| michael@0 | 47 | content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) |
| michael@0 | 48 | #ifdef MOZ_SERVICES_HEALTHREPORT |
| michael@0 | 49 | content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) |
| michael@0 | 50 | content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) |
| michael@0 | 51 | content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) |
| michael@0 | 52 | #endif |
| michael@0 | 53 | content/browser/aboutaccounts/aboutaccounts.xhtml (content/aboutaccounts/aboutaccounts.xhtml) |
| michael@0 | 54 | content/browser/aboutaccounts/aboutaccounts.js (content/aboutaccounts/aboutaccounts.js) |
| michael@0 | 55 | content/browser/aboutaccounts/aboutaccounts.css (content/aboutaccounts/aboutaccounts.css) |
| michael@0 | 56 | content/browser/aboutaccounts/main.css (content/aboutaccounts/main.css) |
| michael@0 | 57 | content/browser/aboutaccounts/normalize.css (content/aboutaccounts/normalize.css) |
| michael@0 | 58 | content/browser/aboutaccounts/images/fox.png (content/aboutaccounts/images/fox.png) |
| michael@0 | 59 | content/browser/aboutaccounts/images/graphic_sync_intro.png (content/aboutaccounts/images/graphic_sync_intro.png) |
| michael@0 | 60 | content/browser/aboutaccounts/images/graphic_sync_intro@2x.png (content/aboutaccounts/images/graphic_sync_intro@2x.png) |
| michael@0 | 61 | |
| michael@0 | 62 | content/browser/certerror/aboutCertError.xhtml (content/aboutcerterror/aboutCertError.xhtml) |
| michael@0 | 63 | content/browser/certerror/aboutCertError.css (content/aboutcerterror/aboutCertError.css) |
| michael@0 | 64 | |
| michael@0 | 65 | content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
| michael@0 | 66 | content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
| michael@0 | 67 | content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
| michael@0 | 68 | content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
| michael@0 | 69 | content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
| michael@0 | 70 | * content/browser/browser.css (content/browser.css) |
| michael@0 | 71 | * content/browser/browser.js (content/browser.js) |
| michael@0 | 72 | * content/browser/browser.xul (content/browser.xul) |
| michael@0 | 73 | * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
| michael@0 | 74 | * content/browser/chatWindow.xul (content/chatWindow.xul) |
| michael@0 | 75 | content/browser/content.js (content/content.js) |
| michael@0 | 76 | content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff) |
| michael@0 | 77 | content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff) |
| michael@0 | 78 | content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff) |
| michael@0 | 79 | content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
| michael@0 | 80 | * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
| michael@0 | 81 | content/browser/newtab/newTab.css (content/newtab/newTab.css) |
| michael@0 | 82 | content/browser/newtab/preloaderContent.js (content/newtab/preloaderContent.js) |
| michael@0 | 83 | * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
| michael@0 | 84 | content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
| michael@0 | 85 | content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
| michael@0 | 86 | content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
| michael@0 | 87 | content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
| michael@0 | 88 | content/browser/pageinfo/feeds.xml (content/pageinfo/feeds.xml) |
| michael@0 | 89 | content/browser/pageinfo/permissions.js (content/pageinfo/permissions.js) |
| michael@0 | 90 | content/browser/pageinfo/security.js (content/pageinfo/security.js) |
| michael@0 | 91 | #ifdef MOZ_SERVICES_SYNC |
| michael@0 | 92 | content/browser/sync/aboutSyncTabs.xul (content/sync/aboutSyncTabs.xul) |
| michael@0 | 93 | content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) |
| michael@0 | 94 | content/browser/sync/aboutSyncTabs.css (content/sync/aboutSyncTabs.css) |
| michael@0 | 95 | content/browser/sync/aboutSyncTabs-bindings.xml (content/sync/aboutSyncTabs-bindings.xml) |
| michael@0 | 96 | * content/browser/sync/setup.xul (content/sync/setup.xul) |
| michael@0 | 97 | content/browser/sync/addDevice.js (content/sync/addDevice.js) |
| michael@0 | 98 | content/browser/sync/addDevice.xul (content/sync/addDevice.xul) |
| michael@0 | 99 | * content/browser/sync/setup.js (content/sync/setup.js) |
| michael@0 | 100 | content/browser/sync/genericChange.xul (content/sync/genericChange.xul) |
| michael@0 | 101 | content/browser/sync/genericChange.js (content/sync/genericChange.js) |
| michael@0 | 102 | content/browser/sync/key.xhtml (content/sync/key.xhtml) |
| michael@0 | 103 | content/browser/sync/notification.xml (content/sync/notification.xml) |
| michael@0 | 104 | content/browser/sync/quota.xul (content/sync/quota.xul) |
| michael@0 | 105 | content/browser/sync/quota.js (content/sync/quota.js) |
| michael@0 | 106 | content/browser/sync/utils.js (content/sync/utils.js) |
| michael@0 | 107 | content/browser/sync/progress.js (content/sync/progress.js) |
| michael@0 | 108 | content/browser/sync/progress.xhtml (content/sync/progress.xhtml) |
| michael@0 | 109 | * content/browser/sync/customize.xul (content/sync/customize.xul) |
| michael@0 | 110 | content/browser/sync/customize.js (content/sync/customize.js) |
| michael@0 | 111 | content/browser/sync/customize.css (content/sync/customize.css) |
| michael@0 | 112 | #endif |
| michael@0 | 113 | content/browser/safeMode.css (content/safeMode.css) |
| michael@0 | 114 | content/browser/safeMode.js (content/safeMode.js) |
| michael@0 | 115 | content/browser/safeMode.xul (content/safeMode.xul) |
| michael@0 | 116 | * content/browser/sanitize.js (content/sanitize.js) |
| michael@0 | 117 | * content/browser/sanitize.xul (content/sanitize.xul) |
| michael@0 | 118 | * content/browser/sanitizeDialog.js (content/sanitizeDialog.js) |
| michael@0 | 119 | content/browser/sanitizeDialog.css (content/sanitizeDialog.css) |
| michael@0 | 120 | content/browser/tabbrowser.css (content/tabbrowser.css) |
| michael@0 | 121 | * content/browser/tabbrowser.xml (content/tabbrowser.xml) |
| michael@0 | 122 | * content/browser/urlbarBindings.xml (content/urlbarBindings.xml) |
| michael@0 | 123 | * content/browser/utilityOverlay.js (content/utilityOverlay.js) |
| michael@0 | 124 | content/browser/web-panels.js (content/web-panels.js) |
| michael@0 | 125 | * content/browser/web-panels.xul (content/web-panels.xul) |
| michael@0 | 126 | * content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.xul) |
| michael@0 | 127 | * content/browser/nsContextMenu.js (content/nsContextMenu.js) |
| michael@0 | 128 | # XXX: We should exclude this one as well (bug 71895) |
| michael@0 | 129 | * content/browser/hiddenWindow.xul (content/hiddenWindow.xul) |
| michael@0 | 130 | #ifdef XP_MACOSX |
| michael@0 | 131 | * content/browser/macBrowserOverlay.xul (content/macBrowserOverlay.xul) |
| michael@0 | 132 | * content/browser/downloadManagerOverlay.xul (content/downloadManagerOverlay.xul) |
| michael@0 | 133 | * content/browser/jsConsoleOverlay.xul (content/jsConsoleOverlay.xul) |
| michael@0 | 134 | * content/browser/softwareUpdateOverlay.xul (content/softwareUpdateOverlay.xul) |
| michael@0 | 135 | #endif |
| michael@0 | 136 | * content/browser/viewSourceOverlay.xul (content/viewSourceOverlay.xul) |
| michael@0 | 137 | #ifdef XP_WIN |
| michael@0 | 138 | content/browser/win6BrowserOverlay.xul (content/win6BrowserOverlay.xul) |
| michael@0 | 139 | #endif |
| michael@0 | 140 | content/browser/socialmarks.xml (content/socialmarks.xml) |
| michael@0 | 141 | content/browser/socialchat.xml (content/socialchat.xml) |
| michael@0 | 142 | # the following files are browser-specific overrides |
| michael@0 | 143 | * content/browser/license.html (/toolkit/content/license.html) |
| michael@0 | 144 | % override chrome://global/content/license.html chrome://browser/content/license.html |
| michael@0 | 145 | #ifdef MOZ_SAFE_BROWSING |
| michael@0 | 146 | content/browser/report-phishing-overlay.xul (content/report-phishing-overlay.xul) |
| michael@0 | 147 | content/browser/blockedSite.xhtml (content/blockedSite.xhtml) |
| michael@0 | 148 | % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul |
| michael@0 | 149 | #endif |
