зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-inbound to mozilla-central. a=merge
--HG-- rename : browser/components/nsBrowserContentHandler.js => browser/components/BrowserContentHandler.jsm
This commit is contained in:
Cosmin Sabou
Коммит
a4b19fcd61
2
CLOBBER
2
CLOBBER
|
|
@ -22,4 +22,4 @@
|
|||
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
||||
# don't change CLOBBER for WebIDL changes any more.
|
||||
|
||||
Merge day clobber
|
||||
Bug 1524688: Deleting preprocessed manifests requires clobber.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "Inflector"
|
||||
version = "0.11.2"
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
aStartIndex, aEndIndex, aValid)
|
||||
{
|
||||
testRole(aID, aRole);
|
||||
is(aAcc.anchorCount, aAnchorCount, "Wrong number of anchors for ID "
|
||||
is(aAcc.anchorCount, aAnchorCount, "Wrong number of anchors for ID "
|
||||
+ aID + "!");
|
||||
is(aAcc.getAnchor(0).name, aAnchorName, "Wrong name for ID " + aID + "!");
|
||||
is(aAcc.getURI(0).spec, aURI, "URI wrong for ID " + aID + "!");
|
||||
is(aAcc.startIndex, aStartIndex, "Wrong startIndex value for ID " + aID
|
||||
is(aAcc.startIndex, aStartIndex, "Wrong startIndex value for ID " + aID
|
||||
+ "!");
|
||||
is(aAcc.endIndex, aEndIndex, "Wrong endIndex value for ID " + aID + "!");
|
||||
is(aAcc.valid, aValid, "Wrong valid state for ID " + aID + "!");
|
||||
is(aAcc.valid, aValid, "Wrong valid state for ID " + aID + "!");
|
||||
}
|
||||
|
||||
var gQueue = null;
|
||||
|
|
@ -89,9 +89,9 @@
|
|||
</pre>
|
||||
</body>
|
||||
|
||||
<label id="linkedLabel" class="text-link" href="http://www.mozilla.org/">
|
||||
<label id="linkedLabel" href="http://www.mozilla.org/" is="text-link">
|
||||
Mozilla Foundation home</label>
|
||||
<label id="linkLabelWithValue" value="Mozilla Foundation" class="text-link"
|
||||
<label id="linkLabelWithValue" value="Mozilla Foundation" is="text-link"
|
||||
href="http://www.mozilla.org/" />
|
||||
<label id="normalLabel" value="This label should not be a link" />
|
||||
</window>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
</label>
|
||||
<hbox align="baseline">
|
||||
<label id="version"/>
|
||||
<label id="releasenotes" class="text-link" hidden="true" data-l10n-id="releaseNotes-link"></label>
|
||||
<label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"></label>
|
||||
</hbox>
|
||||
|
||||
<label id="distribution" class="text-blurb"/>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
<label data-l10n-id="update-applying"></label>
|
||||
</hbox>
|
||||
<hbox id="downloadFailed" align="center" data-l10n-id="update-failed">
|
||||
<label id="failedLink" class="text-link" data-l10n-name="failed-link"></label>
|
||||
<label id="failedLink" is="text-link" data-l10n-name="failed-link"></label>
|
||||
</hbox>
|
||||
<hbox id="policyDisabled" align="center">
|
||||
<label data-l10n-id="update-adminDisabled"></label>
|
||||
|
|
@ -107,10 +107,10 @@
|
|||
<label data-l10n-id="update-otherInstanceHandlingUpdates"></label>
|
||||
</hbox>
|
||||
<hbox id="manualUpdate" align="center" data-l10n-id="update-manual">
|
||||
<label id="manualLink" class="text-link" data-l10n-name="manual-link"/>
|
||||
<label id="manualLink" is="text-link" data-l10n-name="manual-link"/>
|
||||
</hbox>
|
||||
<hbox id="unsupportedSystem" align="center" data-l10n-id="update-unsupported">
|
||||
<label id="unsupportedLink" class="text-link" data-l10n-name="unsupported-link"></label>
|
||||
<label id="unsupportedLink" is="text-link" data-l10n-name="unsupported-link"></label>
|
||||
</hbox>
|
||||
<hbox id="restarting" align="center">
|
||||
<image class="update-throbber"/>
|
||||
|
|
@ -128,26 +128,26 @@
|
|||
<vbox id="experimental" hidden="true">
|
||||
<description class="text-blurb" id="warningDesc" data-l10n-id="warningDesc-version"></description>
|
||||
<description class="text-blurb" id="communityExperimentalDesc" data-l10n-id="community-exp">
|
||||
<label class="text-link" href="http://www.mozilla.org/" data-l10n-name="community-exp-mozillaLink"></label>
|
||||
<label class="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"></label>
|
||||
<label is="text-link" href="http://www.mozilla.org/" data-l10n-name="community-exp-mozillaLink"></label>
|
||||
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"></label>
|
||||
</description>
|
||||
</vbox>
|
||||
<description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
|
||||
<label class="text-link" href="http://www.mozilla.org/" data-l10n-name="community-mozillaLink"></label>
|
||||
<label class="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"></label>
|
||||
<label is="text-link" href="http://www.mozilla.org/" data-l10n-name="community-mozillaLink"></label>
|
||||
<label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"></label>
|
||||
</description>
|
||||
<description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
|
||||
<label class="text-link" href="https://donate.mozilla.org/?utm_source=firefox&utm_medium=referral&utm_campaign=firefox_about&utm_content=firefox_about" data-l10n-name="helpus-donateLink"></label>
|
||||
<label class="text-link" href="http://www.mozilla.org/contribute/" data-l10n-name="helpus-getInvolvedLink"></label>
|
||||
<label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&utm_medium=referral&utm_campaign=firefox_about&utm_content=firefox_about" data-l10n-name="helpus-donateLink"></label>
|
||||
<label is="text-link" href="http://www.mozilla.org/contribute/" data-l10n-name="helpus-getInvolvedLink"></label>
|
||||
</description>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<vbox id="bottomBox">
|
||||
<hbox pack="center">
|
||||
<label class="text-link bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label>
|
||||
<label class="text-link bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"></label>
|
||||
<label class="text-link bottom-link" href="https://www.mozilla.org/privacy/" data-l10n-id="bottomLinks-privacy"></label>
|
||||
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label>
|
||||
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"></label>
|
||||
<label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/" data-l10n-id="bottomLinks-privacy"></label>
|
||||
</hbox>
|
||||
<description id="trademark" data-l10n-id="trademarkInfo"></description>
|
||||
</vbox>
|
||||
|
|
|
|||
|
|
@ -38,8 +38,7 @@ var gEMEHandler = {
|
|||
let mainMessage = gNavigatorBundle.getString("emeNotifications.drmContentDisabled.message");
|
||||
let text = gNavigatorBundle.getString("emeNotifications.drmContentDisabled.learnMoreLabel");
|
||||
let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
|
||||
let link = document.createXULElement("label");
|
||||
link.className = "text-link";
|
||||
let link = document.createXULElement("label", {is: "text-link"});
|
||||
link.setAttribute("href", baseURL + "drm-content");
|
||||
link.textContent = text;
|
||||
return BrowserUtils.getLocalizedFragment(document, mainMessage, link);
|
||||
|
|
|
|||
|
|
@ -474,8 +474,7 @@ var gPluginHandler = {
|
|||
iconURL, priority, buttons);
|
||||
|
||||
// Add the "learn more" link.
|
||||
let link = notification.ownerDocument.createXULElement("label");
|
||||
link.className = "text-link";
|
||||
let link = notification.ownerDocument.createXULElement("label", {is: "text-link"});
|
||||
link.setAttribute("value", gNavigatorBundle.getString("crashedpluginsMessage.learnMore"));
|
||||
let crashurl = formatURL("app.support.baseURL", true);
|
||||
crashurl += "plugin-crashed-notificationbar";
|
||||
|
|
|
|||
|
|
@ -1189,9 +1189,9 @@ var gIdentityHandler = {
|
|||
let icon = document.createXULElement("image");
|
||||
icon.setAttribute("class", "popup-subitem identity-popup-permission-icon");
|
||||
|
||||
let text = document.createXULElement("label");
|
||||
let text = document.createXULElement("label", {is: "text-link"});
|
||||
text.setAttribute("flex", "1");
|
||||
text.setAttribute("class", "identity-popup-permission-label text-link");
|
||||
text.setAttribute("class", "identity-popup-permission-label");
|
||||
|
||||
let popupCount = gBrowser.selectedBrowser.blockedPopups.length;
|
||||
let messageBase = gNavigatorBundle.getString("popupShowBlockedPopupsIndicatorText");
|
||||
|
|
|
|||
|
|
@ -1738,7 +1738,7 @@ var gBrowserInit = {
|
|||
* The functions scheduled here will fire from idle callbacks
|
||||
* once every window has finished being restored by session
|
||||
* restore, and after the equivalent only-once tasks
|
||||
* have run (from _scheduleStartupIdleTasks in nsBrowserGlue.js).
|
||||
* have run (from _scheduleStartupIdleTasks in BrowserGlue.jsm).
|
||||
*/
|
||||
_schedulePerWindowIdleTasks() {
|
||||
// Bail out if the window has been closed in the meantime.
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
<popupnotificationheader id="cfr-notification-header">
|
||||
<stack id="cfr-notification-header-stack">
|
||||
<description id="cfr-notification-header-label"></description>
|
||||
<label id="cfr-notification-header-link" class="text-link">
|
||||
<label id="cfr-notification-header-link" is="text-link">
|
||||
<xul:image id="cfr-notification-header-image"/>
|
||||
</label>
|
||||
</stack>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<hbox id="cfr-notification-footer-empty-stars"/>
|
||||
<label id="cfr-notification-footer-users"/>
|
||||
<spacer id="cfr-notification-footer-spacer" hidden="true"/>
|
||||
<label id="cfr-notification-footer-learn-more-link" class="text-link"/>
|
||||
<label id="cfr-notification-footer-learn-more-link" is="text-link"/>
|
||||
</hbox>
|
||||
</popupnotificationfooter>
|
||||
</popupnotification>
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@
|
|||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml">
|
||||
<label id="test-xul-text-link-label" class="text-link" value="XUL text-link label" href="https://www.mozilla.com"/>
|
||||
<label id="test-xul-text-link-label" is="text-link" value="XUL text-link label" href="https://www.mozilla.com"/>
|
||||
</page>
|
||||
|
|
|
|||
|
|
@ -24,22 +24,19 @@ const startupPhases = {
|
|||
// Anything loaded during app-startup must have a compelling reason
|
||||
// to run before we have even selected the user profile.
|
||||
// Consider loading your code after first paint instead,
|
||||
// eg. from nsBrowserGlue.js' _onFirstWindowLoaded method).
|
||||
// eg. from BrowserGlue.jsm' _onFirstWindowLoaded method).
|
||||
"before profile selection": {whitelist: {
|
||||
components: new Set([
|
||||
"nsBrowserGlue.js",
|
||||
"MainProcessSingleton.js",
|
||||
|
||||
// Bugs to fix: The following components shouldn't be initialized that early.
|
||||
"PushComponents.js", // bug 1369436
|
||||
]),
|
||||
modules: new Set([
|
||||
"resource:///modules/BrowserGlue.jsm",
|
||||
"resource://gre/modules/AppConstants.jsm",
|
||||
"resource://gre/modules/ActorManagerParent.jsm",
|
||||
"resource://gre/modules/CustomElementsListener.jsm",
|
||||
"resource://gre/modules/ExtensionUtils.jsm",
|
||||
"resource://gre/modules/MainProcessSingleton.jsm",
|
||||
"resource://gre/modules/XPCOMUtils.jsm",
|
||||
"resource://gre/modules/Services.jsm",
|
||||
// Bugs to fix: The following components shouldn't be initialized that early.
|
||||
"resource://gre/modules/PushComponents.jsm", // bug 1369436
|
||||
]),
|
||||
}},
|
||||
|
||||
|
|
|
|||
|
|
@ -18,14 +18,13 @@
|
|||
const kDumpAllStacks = false;
|
||||
|
||||
const whitelist = {
|
||||
components: new Set([
|
||||
"ContentProcessSingleton.js",
|
||||
]),
|
||||
modules: new Set([
|
||||
"chrome://mochikit/content/ShutdownLeaksCollector.jsm",
|
||||
"resource://specialpowers/specialpowers.js",
|
||||
"resource://specialpowers/specialpowersAPI.js",
|
||||
|
||||
"resource://gre/modules/ContentProcessSingleton.jsm",
|
||||
|
||||
// General utilities
|
||||
"resource://gre/modules/AppConstants.jsm",
|
||||
"resource://gre/modules/AsyncShutdown.jsm",
|
||||
|
|
@ -100,10 +99,8 @@ const whitelist = {
|
|||
// required, as opposed to items in the main whitelist,
|
||||
// which are all required.
|
||||
const intermittently_loaded_whitelist = {
|
||||
components: new Set([
|
||||
"nsAsyncShutdown.js",
|
||||
]),
|
||||
modules: new Set([
|
||||
"resource://gre/modules/nsAsyncShutdown.jsm",
|
||||
"resource://gre/modules/sessionstore/Utils.jsm",
|
||||
]),
|
||||
frameScripts: new Set([]),
|
||||
|
|
|
|||
|
|
@ -643,6 +643,10 @@ add_task(async function checkAllTheFiles() {
|
|||
// Wait for all manifest to be parsed
|
||||
await throttledMapPromises(manifestURIs, parseManifest);
|
||||
|
||||
for (let jsm of Components.manager.getComponentJSMs()) {
|
||||
gReferencesFromCode.set(jsm, null);
|
||||
}
|
||||
|
||||
// manifest.json is a common name, it is used for WebExtension manifests
|
||||
// but also for other things. To tell them apart, we have to actually
|
||||
// read the contents. This will populate gExtensionRoots with all
|
||||
|
|
|
|||
|
|
@ -1872,7 +1872,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|||
</xul:description>
|
||||
</xul:hbox>
|
||||
<xul:label id="search-suggestions-change-settings"
|
||||
class="text-link"
|
||||
is="text-link"
|
||||
role="link"
|
||||
#ifdef XP_WIN
|
||||
value="&urlbar.searchSuggestionsNotification.changeSettingsWin;"
|
||||
|
|
|
|||
|
|
@ -1,28 +1,3 @@
|
|||
# nsBrowserContentHandler.js
|
||||
component {5d0ce354-df01-421a-83fb-7ead0990c24e} nsBrowserContentHandler.js application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/browser/clh;1 {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
component {47cd0651-b1be-4a0f-b5c4-10e5a573ef71} nsBrowserContentHandler.js application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/browser/final-clh;1 {47cd0651-b1be-4a0f-b5c4-10e5a573ef71} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=text/html {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.mozilla.xul+xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/svg+xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=text/rdf {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=text/xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=application/xhtml+xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=text/css {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=text/plain {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/gif {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/jpeg {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/jpg {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/png {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/bmp {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/x-icon {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=image/vnd.microsoft.icon {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
contract @mozilla.org/uriloader/content-handler;1?type=application/http-index-format {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
category command-line-handler m-browser @mozilla.org/browser/clh;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
category command-line-handler x-default @mozilla.org/browser/final-clh;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
category command-line-validator b-browser @mozilla.org/browser/clh;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
|
||||
# nsBrowserGlue.js
|
||||
|
||||
# This component must restrict its registration for the app-startup category
|
||||
|
|
@ -32,12 +7,4 @@ category command-line-validator b-browser @mozilla.org/browser/clh;1 application
|
|||
# browser: {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||
# mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
|
||||
|
||||
component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js
|
||||
contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc}
|
||||
category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110}
|
||||
component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js
|
||||
contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a}
|
||||
|
||||
# RegisterProtocolHandler support
|
||||
component {efbd7b87-9b15-4684-abf0-dc2679daadb1} WebProtocolHandlerRegistrar.js process=main
|
||||
contract @mozilla.org/embeddor.implemented/web-protocol-handler-registrar;1 {efbd7b87-9b15-4684-abf0-dc2679daadb1} process=main
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
* 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/. */
|
||||
|
||||
var EXPORTED_SYMBOLS = ["nsBrowserContentHandler", "nsDefaultCommandLineHandler"];
|
||||
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
||||
|
|
@ -178,7 +180,7 @@ function getPostUpdateOverridePage(defaultOverridePage) {
|
|||
|
||||
/**
|
||||
* Open a browser window. If this is the initial launch, this function will
|
||||
* attempt to use the navigator:blank window opened by nsBrowserGlue.js during
|
||||
* attempt to use the navigator:blank window opened by BrowserGlue.jsm during
|
||||
* early startup.
|
||||
*
|
||||
* @param cmdLine
|
||||
|
|
@ -325,18 +327,12 @@ function doSearch(searchTerm, cmdLine) {
|
|||
}
|
||||
|
||||
function nsBrowserContentHandler() {
|
||||
if (!gBrowserContentHandler) {
|
||||
gBrowserContentHandler = this;
|
||||
}
|
||||
return gBrowserContentHandler;
|
||||
}
|
||||
nsBrowserContentHandler.prototype = {
|
||||
classID: Components.ID("{5d0ce354-df01-421a-83fb-7ead0990c24e}"),
|
||||
|
||||
_xpcom_factory: {
|
||||
createInstance: function bch_factory_ci(outer, iid) {
|
||||
if (outer)
|
||||
throw Cr.NS_ERROR_NO_AGGREGATION;
|
||||
return gBrowserContentHandler.QueryInterface(iid);
|
||||
},
|
||||
},
|
||||
|
||||
/* nsISupports */
|
||||
QueryInterface: ChromeUtils.generateQI([Ci.nsICommandLineHandler,
|
||||
Ci.nsIBrowserHandler,
|
||||
|
|
@ -733,8 +729,6 @@ function nsDefaultCommandLineHandler() {
|
|||
}
|
||||
|
||||
nsDefaultCommandLineHandler.prototype = {
|
||||
classID: Components.ID("{47cd0651-b1be-4a0f-b5c4-10e5a573ef71}"),
|
||||
|
||||
/* nsISupports */
|
||||
QueryInterface: ChromeUtils.generateQI(["nsICommandLineHandler"]),
|
||||
|
||||
|
|
@ -836,6 +830,3 @@ nsDefaultCommandLineHandler.prototype = {
|
|||
|
||||
helpInfo: "",
|
||||
};
|
||||
|
||||
var components = [nsBrowserContentHandler, nsDefaultCommandLineHandler];
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
* 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/. */
|
||||
|
||||
var EXPORTED_SYMBOLS = ["BrowserGlue", "ContentPermissionPrompt"];
|
||||
|
||||
const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
|
||||
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
|
@ -365,10 +367,7 @@ let ACTORS = {
|
|||
TelemetryTimestamps.add("blankWindowShown");
|
||||
})();
|
||||
|
||||
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetters(this, {
|
||||
WindowsUIUtils: ["@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils"],
|
||||
aboutNewTabService: ["@mozilla.org/browser/aboutnewtab-service;1", "nsIAboutNewTabService"],
|
||||
});
|
||||
XPCOMUtils.defineLazyGetter(this, "WeaveService", () =>
|
||||
|
|
@ -381,7 +380,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
|||
AboutPrivateBrowsingHandler: "resource:///modules/aboutpages/AboutPrivateBrowsingHandler.jsm",
|
||||
AddonManager: "resource://gre/modules/AddonManager.jsm",
|
||||
AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
|
||||
AsyncPrefs: "resource://gre/modules/AsyncPrefs.jsm",
|
||||
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
|
||||
AutoCompletePopup: "resource://gre/modules/AutoCompletePopup.jsm",
|
||||
Blocklist: "resource://gre/modules/Blocklist.jsm",
|
||||
|
|
@ -389,14 +387,11 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
|||
BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.jsm",
|
||||
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
|
||||
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
|
||||
ContentClick: "resource:///modules/ContentClick.jsm",
|
||||
ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
|
||||
CustomizableUI: "resource:///modules/CustomizableUI.jsm",
|
||||
DateTimePickerParent: "resource://gre/modules/DateTimePickerParent.jsm",
|
||||
Discovery: "resource:///modules/Discovery.jsm",
|
||||
ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
|
||||
FileSource: "resource://gre/modules/L10nRegistry.jsm",
|
||||
FormValidationHandler: "resource:///modules/FormValidationHandler.jsm",
|
||||
FxAccounts: "resource://gre/modules/FxAccounts.jsm",
|
||||
HomePage: "resource:///modules/HomePage.jsm",
|
||||
HybridContentTelemetry: "resource://gre/modules/HybridContentTelemetry.jsm",
|
||||
|
|
@ -405,8 +400,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
|||
LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm",
|
||||
LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
|
||||
LiveBookmarkMigrator: "resource:///modules/LiveBookmarkMigrator.jsm",
|
||||
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
|
||||
LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
|
||||
NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
|
||||
Normandy: "resource://normandy/Normandy.jsm",
|
||||
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
|
||||
|
|
@ -415,15 +408,12 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
|||
PageThumbs: "resource://gre/modules/PageThumbs.jsm",
|
||||
PdfJs: "resource://pdf.js/PdfJs.jsm",
|
||||
PermissionUI: "resource:///modules/PermissionUI.jsm",
|
||||
PictureInPicture: "resource://gre/modules/PictureInPicture.jsm",
|
||||
PingCentre: "resource:///modules/PingCentre.jsm",
|
||||
PlacesBackups: "resource://gre/modules/PlacesBackups.jsm",
|
||||
PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
|
||||
PluralForm: "resource://gre/modules/PluralForm.jsm",
|
||||
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
|
||||
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
|
||||
ReaderParent: "resource:///modules/ReaderParent.jsm",
|
||||
RemotePrompt: "resource:///modules/RemotePrompt.jsm",
|
||||
RemoteSettings: "resource://services-settings/remote-settings.js",
|
||||
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
|
||||
Sanitizer: "resource:///modules/Sanitizer.jsm",
|
||||
|
|
@ -439,6 +429,17 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
|||
WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
|
||||
});
|
||||
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
AsyncPrefs: "resource://gre/modules/AsyncPrefs.jsm",
|
||||
ContentClick: "resource:///modules/ContentClick.jsm",
|
||||
FormValidationHandler: "resource:///modules/FormValidationHandler.jsm",
|
||||
LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
|
||||
PictureInPicture: "resource://gre/modules/PictureInPicture.jsm",
|
||||
ReaderParent: "resource:///modules/ReaderParent.jsm",
|
||||
RemotePrompt: "resource:///modules/RemotePrompt.jsm",
|
||||
});
|
||||
|
||||
/* global ContentPrefServiceParent:false, ContentSearch:false,
|
||||
UpdateListener:false, webrtcUI:false */
|
||||
|
||||
|
|
@ -466,7 +467,6 @@ if (AppConstants.MOZ_CRASHREPORTER) {
|
|||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
PluginCrashReporter: "resource:///modules/ContentCrashHandlers.jsm",
|
||||
UnsubmittedCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
|
||||
CrashSubmit: "resource://gre/modules/CrashSubmit.jsm",
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -2985,13 +2985,8 @@ BrowserGlue.prototype = {
|
|||
}
|
||||
},
|
||||
|
||||
// for XPCOM
|
||||
classID: Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
|
||||
|
||||
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver,
|
||||
Ci.nsISupportsWeakReference]),
|
||||
|
||||
_xpcom_factory: XPCOMUtils.generateSingletonFactory(BrowserGlue),
|
||||
};
|
||||
|
||||
var ContentBlockingCategoriesPrefs = {
|
||||
|
|
@ -3489,9 +3484,6 @@ var JawsScreenReaderVersionCheck = {
|
|||
},
|
||||
};
|
||||
|
||||
var components = [BrowserGlue, ContentPermissionPrompt];
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
|
||||
|
||||
// Listen for UITour messages.
|
||||
// Do it here instead of the UITour module itself so that the UITour module is lazy loaded
|
||||
// when the first message is received.
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
pages = [
|
||||
'blocked',
|
||||
'certerror',
|
||||
'config',
|
||||
'downloads',
|
||||
'home',
|
||||
'library',
|
||||
'newinstall',
|
||||
'newtab',
|
||||
'pocket-saved',
|
||||
'pocket-signup',
|
||||
'policies',
|
||||
'preferences',
|
||||
'privatebrowsing',
|
||||
'reader',
|
||||
'restartrequired',
|
||||
'rights',
|
||||
'robots',
|
||||
'searchreset',
|
||||
'sessionrestore',
|
||||
'tabcrashed',
|
||||
'welcome',
|
||||
'welcomeback',
|
||||
]
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980}',
|
||||
'contract_ids': ['@mozilla.org/network/protocol/about;1?what=%s' % page
|
||||
for page in pages],
|
||||
'legacy_constructor': 'mozilla::browser::AboutRedirector::Create',
|
||||
'headers': ['/browser/components/about/AboutRedirector.h'],
|
||||
},
|
||||
]
|
||||
|
|
@ -17,6 +17,10 @@ SOURCES += [
|
|||
'AboutRedirector.cpp',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
EXTRA_JS_MODULES.aboutpages = [
|
||||
'AboutPrivateBrowsingHandler.jsm',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{6deb193c-f87d-4078-bc78-5e64655b4d62}',
|
||||
'contract_ids': ['@mozilla.org/browser/directory-provider;1'],
|
||||
'type': 'mozilla::browser::DirectoryProvider',
|
||||
'headers': ['mozilla/browser/DirectoryProvider.h'],
|
||||
'categories': {'xpcom-directory-providers': 'browser-directory-provider'},
|
||||
},
|
||||
]
|
||||
|
||||
TOOLKIT = buildconfig.substs['MOZ_WIDGET_TOOLKIT']
|
||||
|
||||
shell_service_contracts = [
|
||||
'@mozilla.org/browser/shell-service;1',
|
||||
'@mozilla.org/toolkit/shell-service;1',
|
||||
]
|
||||
|
||||
if TOOLKIT == 'gtk3':
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
|
||||
'contract_ids': shell_service_contracts,
|
||||
'type': 'nsGNOMEShellService',
|
||||
'headers': ['/browser/components/shell/nsGNOMEShellService.h'],
|
||||
'init_method': 'Init',
|
||||
},
|
||||
]
|
||||
elif TOOLKIT == 'cocoa':
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{6fc66a78-6cbc-4b3f-b7ba-379289b29276}',
|
||||
'contract_ids': ['@mozilla.org/mac-attribution;1'],
|
||||
'type': 'nsMacAttributionService',
|
||||
'headers': ['nsMacAttribution.h'],
|
||||
},
|
||||
]
|
||||
|
||||
if buildconfig.substs['OS_ARCH'] == 'Darwin':
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
|
||||
'contract_ids': shell_service_contracts,
|
||||
'type': 'nsMacShellService',
|
||||
'headers': ['/browser/components/shell/nsMacShellService.h'],
|
||||
},
|
||||
]
|
||||
elif buildconfig.substs['OS_ARCH'] == 'WINNT':
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
|
||||
'contract_ids': shell_service_contracts,
|
||||
'type': 'nsWindowsShellService',
|
||||
'headers': ['/browser/components/shell/nsWindowsShellService.h'],
|
||||
},
|
||||
{
|
||||
'cid': '{93480624-806e-4756-b7cb-0fb7dd746a8f}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator/iehistoryenumerator;1'],
|
||||
'type': 'nsIEHistoryEnumerator',
|
||||
'headers': ['/browser/components/migration/nsIEHistoryEnumerator.h'],
|
||||
},
|
||||
]
|
||||
|
|
@ -7,12 +7,8 @@
|
|||
with Files("**"):
|
||||
BUG_COMPONENT = ("Firefox Build System", "General")
|
||||
|
||||
EXPORTS += [
|
||||
'nsBrowserCompsCID.h',
|
||||
]
|
||||
|
||||
SOURCES += [
|
||||
'nsModule.cpp',
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
Library('browsercomps')
|
||||
|
|
|
|||
|
|
@ -40,14 +40,6 @@
|
|||
} \
|
||||
}
|
||||
|
||||
// 7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980
|
||||
#define NS_BROWSER_ABOUT_REDIRECTOR_CID \
|
||||
{ \
|
||||
0x7e4bb6ad, 0x2fc4, 0x4dc6, { \
|
||||
0x89, 0xef, 0x23, 0xe8, 0xe5, 0xcc, 0xf9, 0x80 \
|
||||
} \
|
||||
}
|
||||
|
||||
// {6DEB193C-F87D-4078-BC78-5E64655B4D62}
|
||||
#define NS_BROWSERDIRECTORYPROVIDER_CID \
|
||||
{ \
|
||||
|
|
@ -55,14 +47,3 @@
|
|||
0xbc, 0x78, 0x5e, 0x64, 0x65, 0x5b, 0x4d, 0x62 \
|
||||
} \
|
||||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
# define NS_MACATTRIBUTIONSERVICE_CONTRACTID "@mozilla.org/mac-attribution;1"
|
||||
|
||||
# define NS_MACATTRIBUTIONSERVICE_CID \
|
||||
{ \
|
||||
0x6FC66A78, 0x6CBC, 0x4B3F, { \
|
||||
0xB7, 0xBA, 0x37, 0x92, 0x89, 0xB2, 0x92, 0x76 \
|
||||
} \
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,135 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* 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/. */
|
||||
|
||||
#include "mozilla/ModuleUtils.h"
|
||||
|
||||
#include "nsBrowserCompsCID.h"
|
||||
#include "DirectoryProvider.h"
|
||||
|
||||
#if defined(XP_WIN)
|
||||
# include "nsWindowsShellService.h"
|
||||
#elif defined(XP_MACOSX)
|
||||
# include "nsMacShellService.h"
|
||||
#elif defined(MOZ_WIDGET_GTK)
|
||||
# include "nsGNOMEShellService.h"
|
||||
#endif
|
||||
#include "nsIToolkitShellService.h"
|
||||
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
# include "nsMacAttribution.h"
|
||||
#endif
|
||||
|
||||
#if defined(XP_WIN)
|
||||
# include "nsIEHistoryEnumerator.h"
|
||||
#endif
|
||||
|
||||
#include "AboutRedirector.h"
|
||||
#include "nsIAboutModule.h"
|
||||
|
||||
#include "nsNetCID.h"
|
||||
|
||||
using namespace mozilla::browser;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
|
||||
#if defined(XP_WIN)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
|
||||
#elif defined(XP_MACOSX)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
|
||||
#elif defined(MOZ_WIDGET_GTK)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacAttributionService)
|
||||
#endif
|
||||
|
||||
#if defined(XP_WIN)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
|
||||
#endif
|
||||
|
||||
NS_DEFINE_NAMED_CID(NS_BROWSERDIRECTORYPROVIDER_CID);
|
||||
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(XP_MACOSX)
|
||||
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
|
||||
#endif
|
||||
NS_DEFINE_NAMED_CID(NS_BROWSER_ABOUT_REDIRECTOR_CID);
|
||||
#if defined(XP_WIN)
|
||||
NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUMERATOR_CID);
|
||||
#endif
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSERVICE_CID);
|
||||
#endif
|
||||
|
||||
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
|
||||
// clang-format off
|
||||
{ &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
|
||||
#if defined(XP_WIN)
|
||||
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor },
|
||||
#elif defined(MOZ_WIDGET_GTK)
|
||||
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
|
||||
#elif defined(XP_MACOSX)
|
||||
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
|
||||
#endif
|
||||
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
|
||||
#if defined(XP_WIN)
|
||||
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
|
||||
#endif
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
{ &kNS_MACATTRIBUTIONSERVICE_CID, false, nullptr, nsMacAttributionServiceConstructor },
|
||||
#endif
|
||||
{ nullptr }
|
||||
// clang-format on
|
||||
};
|
||||
|
||||
static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
|
||||
// clang-format off
|
||||
{ NS_BROWSERDIRECTORYPROVIDER_CONTRACTID, &kNS_BROWSERDIRECTORYPROVIDER_CID },
|
||||
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(XP_MACOSX)
|
||||
{ NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
|
||||
{ NS_TOOLKITSHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
|
||||
#endif
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "blocked", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "certerror", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "config", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "tabcrashed", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "privatebrowsing", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "rights", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "robots", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "searchreset", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "sessionrestore", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "welcomeback", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "home", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "newtab", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "library", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "preferences", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "downloads", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "reader", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "restartrequired", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "welcome", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "policies", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "pocket-saved", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "pocket-signup", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
{ NS_ABOUT_MODULE_CONTRACTID_PREFIX "newinstall", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
|
||||
#if defined(XP_WIN)
|
||||
{ NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID },
|
||||
#endif
|
||||
#if defined(MOZ_WIDGET_COCOA)
|
||||
{ NS_MACATTRIBUTIONSERVICE_CONTRACTID, &kNS_MACATTRIBUTIONSERVICE_CID },
|
||||
#endif
|
||||
{ nullptr }
|
||||
// clang-format on
|
||||
};
|
||||
|
||||
static const mozilla::Module::CategoryEntry kBrowserCategories[] = {
|
||||
{XPCOM_DIRECTORY_PROVIDER_CATEGORY, "browser-directory-provider",
|
||||
NS_BROWSERDIRECTORYPROVIDER_CONTRACTID},
|
||||
{nullptr}};
|
||||
|
||||
static const mozilla::Module kBrowserModule = {mozilla::Module::kVersion,
|
||||
kBrowserCIDs, kBrowserContracts,
|
||||
kBrowserCategories};
|
||||
|
||||
NSMODULE_DEFN(nsBrowserCompsModule) = &kBrowserModule;
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{5d0ce354-df01-421a-83fb-7ead0990c24e}',
|
||||
'contract_ids': [
|
||||
'@mozilla.org/browser/clh;1',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=application/http-index-format',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=application/vnd.mozilla.xul+xml',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=application/xhtml+xml',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/bmp',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/gif',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/jpeg',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/jpg',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/png',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/svg+xml',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/vnd.microsoft.icon',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=image/x-icon',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=text/css',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=text/html',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=text/plain',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=text/rdf',
|
||||
'@mozilla.org/uriloader/content-handler;1?type=text/xml',
|
||||
],
|
||||
'jsm': 'resource:///modules/BrowserContentHandler.jsm',
|
||||
'constructor': 'nsBrowserContentHandler',
|
||||
'categories': {
|
||||
'command-line-handler': 'm-browser',
|
||||
'command-line-validator': 'b-browser',
|
||||
},
|
||||
},
|
||||
{
|
||||
'cid': '{47cd0651-b1be-4a0f-b5c4-10e5a573ef71}',
|
||||
'contract_ids': ['@mozilla.org/browser/final-clh;1'],
|
||||
'jsm': 'resource:///modules/BrowserContentHandler.jsm',
|
||||
'constructor': 'nsDefaultCommandLineHandler',
|
||||
'categories': {'command-line-handler': 'x-default'},
|
||||
},
|
||||
{
|
||||
'cid': '{eab9012e-5f74-4cbc-b2b5-a590235513cc}',
|
||||
'contract_ids': ['@mozilla.org/browser/browserglue;1'],
|
||||
'jsm': 'resource:///modules/BrowserGlue.jsm',
|
||||
'constructor': 'BrowserGlue',
|
||||
},
|
||||
{
|
||||
'cid': '{d8903bf6-68d5-4e97-bcd1-e4d3012f721a}',
|
||||
'contract_ids': ['@mozilla.org/content-permission/prompt;1'],
|
||||
'jsm': 'resource:///modules/BrowserGlue.jsm',
|
||||
'constructor': 'ContentPermissionPrompt',
|
||||
},
|
||||
]
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
oncommand="ContentBlocking.enableForCurrentPage(); gIdentityHandler.recordClick('block');" />
|
||||
<label id="identity-popup-content-blocking-report-breakage"
|
||||
onclick="ContentBlocking.showReportBreakageSubview(); gIdentityHandler.recordClick('report_breakage');"
|
||||
class="text-link subviewkeynav"
|
||||
is="text-link" class="subviewkeynav"
|
||||
flex="1">&contentBlocking.openBreakageReportView2.label;</label>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
and-when-loginforms="secure">&identity.description.insecure;</description>
|
||||
|
||||
<!-- Insecure login forms -->
|
||||
<description when-loginforms="insecure">&identity.description.insecureLoginForms; <label id="identity-popup-insecure-login-forms-learn-more" class="text-link plain" value="&identity.learnMore;"/></description>
|
||||
<description when-loginforms="insecure">&identity.description.insecureLoginForms; <label id="identity-popup-insecure-login-forms-learn-more" is="text-link" class="plain" value="&identity.learnMore;"/></description>
|
||||
|
||||
<!-- Weak Cipher -->
|
||||
<description when-ciphers="weak">&identity.description.weakCipher;</description>
|
||||
|
|
@ -205,27 +205,27 @@
|
|||
|
||||
<!-- Active Mixed Content Blocked -->
|
||||
<description class="identity-popup-warning-gray"
|
||||
when-mixedcontent="active-blocked">&identity.description.activeBlocked; <label class="identity-popup-mcb-learn-more text-link plain" value="&identity.learnMore;"/></description>
|
||||
when-mixedcontent="active-blocked">&identity.description.activeBlocked; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
|
||||
|
||||
<!-- Passive Mixed Content Loaded -->
|
||||
<description when-mixedcontent="passive-loaded">&identity.description.passiveLoaded;</description>
|
||||
<description class="identity-popup-warning-yellow"
|
||||
when-mixedcontent="passive-loaded">&identity.description.passiveLoaded2; <label class="identity-popup-mcb-learn-more text-link plain" value="&identity.learnMore;"/></description>
|
||||
when-mixedcontent="passive-loaded">&identity.description.passiveLoaded2; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
|
||||
|
||||
<!-- Passive Mixed Content Loaded, Active Mixed Content Blocked -->
|
||||
<description when-mixedcontent="passive-loaded active-blocked">&identity.description.passiveLoaded;</description>
|
||||
<description when-mixedcontent="passive-loaded active-blocked"
|
||||
class="identity-popup-warning-yellow">&identity.description.passiveLoaded3; <label class="identity-popup-mcb-learn-more text-link plain" value="&identity.learnMore;"/></description>
|
||||
class="identity-popup-warning-yellow">&identity.description.passiveLoaded3; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
|
||||
|
||||
<!-- Active Mixed Content Blocking Disabled -->
|
||||
<description when-mixedcontent="active-loaded"
|
||||
and-when-loginforms="secure">&identity.description.activeLoaded;</description>
|
||||
<description when-mixedcontent="active-loaded"
|
||||
and-when-loginforms="secure">&identity.description.activeLoaded2; <label class="identity-popup-mcb-learn-more text-link plain" value="&identity.learnMore;"/></description>
|
||||
and-when-loginforms="secure">&identity.description.activeLoaded2; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
|
||||
<!-- Show only the first message when there are insecure login forms,
|
||||
and make sure the Learn More link is included. -->
|
||||
<description when-mixedcontent="active-loaded"
|
||||
and-when-loginforms="insecure">&identity.description.activeLoaded; <label class="identity-popup-mcb-learn-more text-link plain" value="&identity.learnMore;"/></description>
|
||||
and-when-loginforms="insecure">&identity.description.activeLoaded; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
|
||||
|
||||
<!-- Buttons to enable/disable mixed content blocking. -->
|
||||
<button when-mixedcontent="active-blocked"
|
||||
|
|
@ -320,7 +320,7 @@
|
|||
<vbox id="identity-popup-breakageReportView-heading">
|
||||
<description>&contentBlocking.breakageReportView2.description;</description>
|
||||
<label id="identity-popup-breakageReportView-learn-more"
|
||||
class="text-link">&contentBlocking.breakageReportView.learnMore;</label>
|
||||
is="text-link">&contentBlocking.breakageReportView.learnMore;</label>
|
||||
</vbox>
|
||||
<vbox id="identity-popup-breakageReportView-body" class="panel-view-body-unscrollable">
|
||||
<vbox class="identity-popup-breakageReportView-collection-section">
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
hidden="true">
|
||||
<popupnotificationcontent id="update-available-notification-content" orient="vertical">
|
||||
<description id="update-available-description">&updateAvailable.message;</description>
|
||||
<label id="update-available-whats-new" class="text-link" value="&updateAvailable.whatsnew.label;" />
|
||||
<label id="update-available-whats-new" is="text-link" value="&updateAvailable.whatsnew.label;" />
|
||||
</popupnotificationcontent>
|
||||
</popupnotification>
|
||||
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
hidden="true">
|
||||
<popupnotificationcontent id="update-manual-notification-content" orient="vertical">
|
||||
<description id="update-manual-description">&updateManual.message;</description>
|
||||
<label id="update-manual-whats-new" class="text-link" value="&updateManual.whatsnew.label;" />
|
||||
<label id="update-manual-whats-new" is="text-link" value="&updateManual.whatsnew.label;" />
|
||||
</popupnotificationcontent>
|
||||
</popupnotification>
|
||||
|
||||
|
|
|
|||
|
|
@ -303,8 +303,8 @@ class ExtensionControlledPopup {
|
|||
BrowserUtils.getLocalizedFragment(doc, message, addonDetails));
|
||||
}
|
||||
|
||||
let link = doc.createXULElement("label");
|
||||
link.setAttribute("class", "learnMore text-link");
|
||||
let link = doc.createXULElement("label", {is: "text-link"});
|
||||
link.setAttribute("class", "learnMore");
|
||||
link.href = Services.urlFormatter.formatURLPref("app.support.baseURL") + this.learnMoreLink;
|
||||
link.textContent = strBundle.GetStringFromName(this.learnMoreMessageId);
|
||||
description.appendChild(link);
|
||||
|
|
|
|||
|
|
@ -321,4 +321,4 @@ Qihoo360seProfileMigrator.prototype.classDescription = "360 Secure Browser Profi
|
|||
Qihoo360seProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=360se";
|
||||
Qihoo360seProfileMigrator.prototype.classID = Components.ID("{d0037b95-296a-4a4e-94b2-c3d075d20ab1}");
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([Qihoo360seProfileMigrator]);
|
||||
var EXPORTED_SYMBOLS = ["Qihoo360seProfileMigrator"];
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
component {6F8BB968-C14F-4D6F-9733-6C6737B35DCE} ProfileMigrator.js
|
||||
contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737B35DCE}
|
||||
|
||||
#if defined(XP_WIN) || defined(XP_MACOSX)
|
||||
component {4bf85aa5-4e21-46ca-825f-f9c51a5e8c76} ChromeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=canary {4bf85aa5-4e21-46ca-825f-f9c51a5e8c76}
|
||||
#else
|
||||
component {47f75963-840b-4950-a1f0-d9c1864f8b8e} ChromeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=chrome-beta {47f75963-840b-4950-a1f0-d9c1864f8b8e}
|
||||
component {7370a02a-4886-42c3-a4ec-d48c726ec30a} ChromeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=chrome-dev {7370a02a-4886-42c3-a4ec-d48c726ec30a}
|
||||
#endif
|
||||
component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
|
||||
component {8cece922-9720-42de-b7db-7cef88cb07ca} ChromeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=chromium {8cece922-9720-42de-b7db-7cef88cb07ca}
|
||||
|
||||
component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
|
||||
|
||||
#ifdef HAS_IE_MIGRATOR
|
||||
component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
|
||||
#endif
|
||||
|
||||
#ifdef HAS_EDGE_MIGRATOR
|
||||
component {62e8834b-2d17-49f5-96ff-56344903a2ae} EdgeProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=edge {62e8834b-2d17-49f5-96ff-56344903a2ae}
|
||||
#endif
|
||||
|
||||
#ifdef HAS_SAFARI_MIGRATOR
|
||||
component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=safari {4b609ecf-60b2-4655-9df4-dc149e474da1}
|
||||
#endif
|
||||
#ifdef HAS_360SE_MIGRATOR
|
||||
component {d0037b95-296a-4a4e-94b2-c3d075d20ab1} 360seProfileMigrator.js
|
||||
contract @mozilla.org/profile/migrator;1?app=browser&type=360se {d0037b95-296a-4a4e-94b2-c3d075d20ab1}
|
||||
#endif
|
||||
|
|
@ -16,7 +16,6 @@ const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.j
|
|||
const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
|
||||
const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {ChromeMigrationUtils} = ChromeUtils.import("resource:///modules/ChromeMigrationUtils.jsm");
|
||||
const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
|
||||
|
||||
|
|
@ -432,7 +431,7 @@ ChromiumProfileMigrator.prototype.classDescription = "Chromium Profile Migrator"
|
|||
ChromiumProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=chromium";
|
||||
ChromiumProfileMigrator.prototype.classID = Components.ID("{8cece922-9720-42de-b7db-7cef88cb07ca}");
|
||||
|
||||
var componentsArray = [ChromeProfileMigrator, ChromiumProfileMigrator];
|
||||
var EXPORTED_SYMBOLS = ["ChromeProfileMigrator", "ChromiumProfileMigrator"];
|
||||
|
||||
/**
|
||||
* Chrome Canary
|
||||
|
|
@ -447,7 +446,7 @@ CanaryProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?ap
|
|||
CanaryProfileMigrator.prototype.classID = Components.ID("{4bf85aa5-4e21-46ca-825f-f9c51a5e8c76}");
|
||||
|
||||
if (AppConstants.platform == "win" || AppConstants.platform == "macosx") {
|
||||
componentsArray.push(CanaryProfileMigrator);
|
||||
EXPORTED_SYMBOLS.push("CanaryProfileMigrator");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -470,7 +469,5 @@ if (AppConstants.platform != "win" && AppConstants.platform != "macosx") {
|
|||
ChromeBetaMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=chrome-beta";
|
||||
ChromeBetaMigrator.prototype.classID = Components.ID("{47f75963-840b-4950-a1f0-d9c1864f8b8e}");
|
||||
|
||||
componentsArray.push(ChromeDevMigrator, ChromeBetaMigrator);
|
||||
EXPORTED_SYMBOLS.push("ChromeDevMigrator", "ChromeBetaMigrator");
|
||||
}
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(componentsArray);
|
||||
|
|
@ -496,4 +496,4 @@ EdgeProfileMigrator.prototype.classDescription = "Edge Profile Migrator";
|
|||
EdgeProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=edge";
|
||||
EdgeProfileMigrator.prototype.classID = Components.ID("{62e8834b-2d17-49f5-96ff-56344903a2ae}");
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([EdgeProfileMigrator]);
|
||||
var EXPORTED_SYMBOLS = ["EdgeProfileMigrator"];
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
* from the source profile.
|
||||
*/
|
||||
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {MigrationUtils, MigratorPrototype} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
|
|
@ -276,4 +275,4 @@ FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
|
|||
FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
|
||||
FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
|
||||
var EXPORTED_SYMBOLS = ["FirefoxProfileMigrator"];
|
||||
|
|
@ -356,4 +356,4 @@ IEProfileMigrator.prototype.classDescription = "IE Profile Migrator";
|
|||
IEProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=ie";
|
||||
IEProfileMigrator.prototype.classID = Components.ID("{3d2532e3-4932-4774-b7ba-968f5899d3a4}");
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([IEProfileMigrator]);
|
||||
var EXPORTED_SYMBOLS = ["IEProfileMigrator"];
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
"use strict";
|
||||
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {MigrationUtils} = ChromeUtils.import("resource:///modules/MigrationUtils.jsm");
|
||||
|
||||
function ProfileMigrator() {
|
||||
|
|
@ -18,4 +17,4 @@ ProfileMigrator.prototype = {
|
|||
classID: Components.ID("6F8BB968-C14F-4D6F-9733-6C6737B35DCE"),
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([ProfileMigrator]);
|
||||
var EXPORTED_SYMBOLS = ["ProfileMigrator"];
|
||||
|
|
@ -382,4 +382,4 @@ SafariProfileMigrator.prototype.classDescription = "Safari Profile Migrator";
|
|||
SafariProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=safari";
|
||||
SafariProfileMigrator.prototype.classID = Components.ID("{4b609ecf-60b2-4655-9df4-dc149e474da1}");
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SafariProfileMigrator]);
|
||||
var EXPORTED_SYMBOLS = ["SafariProfileMigrator"];
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
XP_WIN = buildconfig.substs['OS_ARCH'] == 'WINNT'
|
||||
XP_MACOSX = buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'cocoa'
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{6F8BB968-C14F-4D6F-9733-6C6737B35DCE}',
|
||||
'contract_ids': ['@mozilla.org/toolkit/profile-migrator;1'],
|
||||
'jsm': 'resource:///modules/ProfileMigrator.jsm',
|
||||
'constructor': 'ProfileMigrator',
|
||||
},
|
||||
{
|
||||
'cid': '{4cec1de4-1671-4fc3-a53e-6c539dc77a26}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=chrome'],
|
||||
'jsm': 'resource:///modules/ChromeProfileMigrator.jsm',
|
||||
'constructor': 'ChromeProfileMigrator',
|
||||
},
|
||||
{
|
||||
'cid': '{8cece922-9720-42de-b7db-7cef88cb07ca}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=chromium'],
|
||||
'jsm': 'resource:///modules/ChromeProfileMigrator.jsm',
|
||||
'constructor': 'ChromiumProfileMigrator',
|
||||
},
|
||||
{
|
||||
'cid': '{91185366-ba97-4438-acba-48deaca63386}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=firefox'],
|
||||
'jsm': 'resource:///modules/FirefoxProfileMigrator.jsm',
|
||||
'constructor': 'FirefoxProfileMigrator',
|
||||
},
|
||||
]
|
||||
|
||||
if XP_WIN or XP_MACOSX:
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{4bf85aa5-4e21-46ca-825f-f9c51a5e8c76}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=canary'],
|
||||
'jsm': 'resource:///modules/ChromeProfileMigrator.jsm',
|
||||
'constructor': 'CanaryProfileMigrator',
|
||||
},
|
||||
]
|
||||
else:
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{47f75963-840b-4950-a1f0-d9c1864f8b8e}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=chrome-beta'],
|
||||
'jsm': 'resource:///modules/ChromeProfileMigrator.jsm',
|
||||
'constructor': ' ChromeBetaMigrator',
|
||||
},
|
||||
{
|
||||
'cid': '{7370a02a-4886-42c3-a4ec-d48c726ec30a}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=chrome-dev'],
|
||||
'jsm': 'resource:///modules/ChromeProfileMigrator.jsm',
|
||||
'constructor': ' ChromeDevMigrator',
|
||||
},
|
||||
]
|
||||
|
||||
if XP_WIN:
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{3d2532e3-4932-4774-b7ba-968f5899d3a4}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=ie'],
|
||||
'jsm': 'resource:///modules/IEProfileMigrator.jsm',
|
||||
'constructor': 'IEProfileMigrator',
|
||||
},
|
||||
{
|
||||
'cid': '{62e8834b-2d17-49f5-96ff-56344903a2ae}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=edge'],
|
||||
'jsm': 'resource:///modules/EdgeProfileMigrator.jsm',
|
||||
'constructor': 'EdgeProfileMigrator',
|
||||
},
|
||||
{
|
||||
'cid': '{d0037b95-296a-4a4e-94b2-c3d075d20ab1}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=360se'],
|
||||
'jsm': 'resource:///modules/360seProfileMigrator.jsm',
|
||||
'constructor': 'Qihoo360seProfileMigrator',
|
||||
},
|
||||
]
|
||||
|
||||
if XP_MACOSX:
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{4b609ecf-60b2-4655-9df4-dc149e474da1}',
|
||||
'contract_ids': ['@mozilla.org/profile/migrator;1?app=browser&type=safari'],
|
||||
'jsm': 'resource:///modules/SafariProfileMigrator.jsm',
|
||||
'constructor': 'SafariProfileMigrator',
|
||||
},
|
||||
]
|
||||
|
|
@ -16,43 +16,34 @@ XPIDL_SOURCES += [
|
|||
|
||||
XPIDL_MODULE = 'migration'
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'ChromeProfileMigrator.js',
|
||||
'FirefoxProfileMigrator.js',
|
||||
'ProfileMigrator.js',
|
||||
]
|
||||
|
||||
EXTRA_PP_COMPONENTS += [
|
||||
'BrowserProfileMigrators.manifest',
|
||||
]
|
||||
|
||||
EXTRA_JS_MODULES += [
|
||||
'ChromeMigrationUtils.jsm',
|
||||
'ChromeProfileMigrator.jsm',
|
||||
'FirefoxProfileMigrator.jsm',
|
||||
'MigrationUtils.jsm',
|
||||
'ProfileMigrator.jsm',
|
||||
]
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
SOURCES += [
|
||||
'nsIEHistoryEnumerator.cpp',
|
||||
]
|
||||
EXTRA_COMPONENTS += [
|
||||
'360seProfileMigrator.js',
|
||||
'EdgeProfileMigrator.js',
|
||||
'IEProfileMigrator.js',
|
||||
]
|
||||
EXTRA_JS_MODULES += [
|
||||
'360seProfileMigrator.jsm',
|
||||
'EdgeProfileMigrator.jsm',
|
||||
'ESEDBReader.jsm',
|
||||
'IEProfileMigrator.jsm',
|
||||
'MSMigrationUtils.jsm',
|
||||
]
|
||||
DEFINES['HAS_360SE_MIGRATOR'] = True
|
||||
DEFINES['HAS_IE_MIGRATOR'] = True
|
||||
DEFINES['HAS_EDGE_MIGRATOR'] = True
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
EXTRA_COMPONENTS += [
|
||||
'SafariProfileMigrator.js',
|
||||
EXTRA_JS_MODULES += [
|
||||
'SafariProfileMigrator.jsm',
|
||||
]
|
||||
DEFINES['HAS_SAFARI_MIGRATOR'] = True
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'browsercomps'
|
||||
|
||||
|
|
|
|||
|
|
@ -74,15 +74,19 @@ XPIDL_SOURCES += [
|
|||
|
||||
XPIDL_MODULE = 'browsercompsbase'
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'BrowserComponents.manifest',
|
||||
'nsBrowserContentHandler.js',
|
||||
'nsBrowserGlue.js',
|
||||
'tests/startupRecorder.js',
|
||||
'tests/testComponents.manifest',
|
||||
]
|
||||
|
||||
EXTRA_JS_MODULES += [
|
||||
'BrowserContentHandler.jsm',
|
||||
'BrowserGlue.jsm',
|
||||
'distribution.js',
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -361,4 +361,4 @@ AboutNewTabService.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutNewTabService]);
|
||||
var EXPORTED_SYMBOLS = ["AboutNewTabService"];
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
component {dfcd2adc-7867-4d3a-ba70-17501f208142} aboutNewTabService.js
|
||||
contract @mozilla.org/browser/aboutnewtab-service;1 {dfcd2adc-7867-4d3a-ba70-17501f208142}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{dfcd2adc-7867-4d3a-ba70-17501f208142}',
|
||||
'contract_ids': ['@mozilla.org/browser/aboutnewtab-service;1'],
|
||||
'jsm': 'resource:///modules/AboutNewTabService.jsm',
|
||||
'constructor': 'AboutNewTabService',
|
||||
},
|
||||
]
|
||||
|
|
@ -136,8 +136,8 @@ this.AboutPreferences = class AboutPreferences {
|
|||
*/
|
||||
renderPreferences({document, Preferences, gHomePane}, strings, prefStructure, discoveryStreamConfig) {
|
||||
// Helper to create a new element and append it
|
||||
const createAppend = (tag, parent) => parent.appendChild(
|
||||
document.createXULElement(tag));
|
||||
const createAppend = (tag, parent, options) => parent.appendChild(
|
||||
document.createXULElement(tag, options));
|
||||
|
||||
// Helper to get strings and format with values if necessary
|
||||
const formatString = id => {
|
||||
|
|
@ -225,9 +225,8 @@ this.AboutPreferences = class AboutPreferences {
|
|||
sponsoredHbox.appendChild(checkbox);
|
||||
checkbox.classList.add("tail-with-learn-more");
|
||||
|
||||
const link = createAppend("label", sponsoredHbox);
|
||||
const link = createAppend("label", sponsoredHbox, {is: "text-link"});
|
||||
link.classList.add("learn-sponsored");
|
||||
link.classList.add("text-link");
|
||||
link.setAttribute("href", sectionData.learnMore.link.href);
|
||||
link.textContent = formatString(sectionData.learnMore.link.id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,9 +19,12 @@ XPIDL_SOURCES += [
|
|||
|
||||
XPIDL_MODULE = 'browser-newtab'
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'aboutNewTabService.js',
|
||||
'NewTabComponents.manifest',
|
||||
EXTRA_JS_MODULES += [
|
||||
'AboutNewTabService.jsm',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
|
|
|||
|
|
@ -301,4 +301,4 @@ PaymentUIService.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PaymentUIService]);
|
||||
var EXPORTED_SYMBOLS = ["PaymentUIService"];
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{01f8bd55-9017-438b-85ec-7c15d2b35cdc}',
|
||||
'contract_ids': ['@mozilla.org/dom/payments/payment-ui-service;1'],
|
||||
'jsm': 'resource:///modules/PaymentUIService.jsm',
|
||||
'constructor': 'PaymentUIService',
|
||||
},
|
||||
]
|
||||
|
|
@ -9,9 +9,12 @@ BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
|
|||
with Files('**'):
|
||||
BUG_COMPONENT = ('Firefox', 'WebPayments UI')
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'payments.manifest',
|
||||
'paymentUIService.js',
|
||||
EXTRA_JS_MODULES += [
|
||||
'PaymentUIService.jsm',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
component {01f8bd55-9017-438b-85ec-7c15d2b35cdc} paymentUIService.js
|
||||
contract @mozilla.org/dom/payments/payment-ui-service;1 {01f8bd55-9017-438b-85ec-7c15d2b35cdc}
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
<hbox hidden="true"
|
||||
class="container-header-links"
|
||||
data-category="paneContainers">
|
||||
<label class="text-link" id="backContainersLink" data-l10n-id="containers-back-link"/>
|
||||
<label is="text-link" id="backContainersLink" data-l10n-id="containers-back-link"/>
|
||||
</hbox>
|
||||
|
||||
<hbox id="header-containers"
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
data-l10n-id="browser-containers-enabled"
|
||||
preference="privacy.userContext.enabled"
|
||||
onsyncfrompreference="return gMainPane.readBrowserContainersCheckbox();"/>
|
||||
<label id="browserContainersLearnMore" class="learnMore text-link" data-l10n-id="browser-containers-learn-more"/>
|
||||
<label id="browserContainersLearnMore" is="text-link" class="learnMore" data-l10n-id="browser-containers-learn-more"/>
|
||||
<spacer flex="1"/>
|
||||
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
|
||||
<hbox>
|
||||
|
|
@ -399,7 +399,7 @@
|
|||
<hbox align="center">
|
||||
<checkbox id="playDRMContent" preference="media.eme.enabled"
|
||||
class="tail-with-learn-more" data-l10n-id="play-drm-content" />
|
||||
<label id="playDRMContentLink" class="learnMore text-link" data-l10n-id="play-drm-content-learn-more"/>
|
||||
<label id="playDRMContentLink" class="learnMore" data-l10n-id="play-drm-content-learn-more" is="text-link"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
|
|
@ -509,7 +509,7 @@
|
|||
<hbox id="manualUpdate" align="start">
|
||||
<image class="face-sad"/>
|
||||
<description flex="1" data-l10n-id="update-manual">
|
||||
<label id="manualLink" class="text-link" data-l10n-name="manual-link"/>
|
||||
<label id="manualLink" data-l10n-name="manual-link" is="text-link"/>
|
||||
</description>
|
||||
<spacer flex="1"/>
|
||||
<button data-l10n-id="update-checkForUpdatesButton"
|
||||
|
|
@ -517,7 +517,7 @@
|
|||
</hbox>
|
||||
<hbox id="unsupportedSystem" align="start">
|
||||
<description flex="1" data-l10n-id="update-unsupported">
|
||||
<label id="unsupportedLink" class="learnMore text-link" data-l10n-name="unsupported-link"></label>
|
||||
<label id="unsupportedLink" class="learnMore" data-l10n-name="unsupported-link" is="text-link"></label>
|
||||
</description>
|
||||
<spacer flex="1"/>
|
||||
<button data-l10n-id="update-checkForUpdatesButton"
|
||||
|
|
@ -575,7 +575,7 @@
|
|||
class="tail-with-learn-more"
|
||||
data-l10n-id="performance-use-recommended-settings-checkbox"
|
||||
preference="browser.preferences.defaultPerformanceSettings.enabled"/>
|
||||
<label id="performanceSettingsLearnMore" class="learnMore text-link" data-l10n-id="performance-settings-learn-more"/>
|
||||
<label id="performanceSettingsLearnMore" class="learnMore" data-l10n-id="performance-settings-learn-more" is="text-link"/>
|
||||
</hbox>
|
||||
<description class="indent tip-caption" data-l10n-id="performance-use-recommended-settings-desc"/>
|
||||
|
||||
|
|
@ -640,7 +640,7 @@
|
|||
class="tail-with-learn-more"
|
||||
data-l10n-id="browsing-cfr-recommendations"
|
||||
preference="browser.newtabpage.activity-stream.asrouter.userprefs.cfr"/>
|
||||
<label id="cfrLearnMore" class="learnMore text-link" data-l10n-id="browsing-cfr-recommendations-learn-more"/>
|
||||
<label id="cfrLearnMore" class="learnMore" data-l10n-id="browsing-cfr-recommendations-learn-more" is="text-link"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
|
|
@ -659,7 +659,7 @@
|
|||
<hbox align="center" flex="1">
|
||||
<description id="connectionSettingsDescription" control="connectionSettings"/>
|
||||
<spacer width="5"/>
|
||||
<label id="connectionSettingsLearnMore" class="learnMore text-link"
|
||||
<label id="connectionSettingsLearnMore" class="learnMore" is="text-link"
|
||||
data-l10n-id="network-proxy-connection-learn-more">
|
||||
</label>
|
||||
<separator orient="vertical"/>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
<spacer flex="1"/>
|
||||
|
||||
<hbox class="sidebar-footer-button" pack="center">
|
||||
<label id="addonsButton" class="text-link">
|
||||
<label id="addonsButton" is="text-link">
|
||||
<hbox align="center">
|
||||
<image class="sidebar-footer-icon addons-icon"/>
|
||||
<label class="sidebar-footer-label" flex="1" data-l10n-id="addons-button-label"></label>
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
</hbox>
|
||||
|
||||
<hbox class="sidebar-footer-button help-button" pack="center">
|
||||
<label id="helpButton" class="text-link">
|
||||
<label id="helpButton" is="text-link">
|
||||
<hbox align="center">
|
||||
<image class="sidebar-footer-icon help-icon"/>
|
||||
<label class="sidebar-footer-label" flex="1" data-l10n-id="help-button-label"></label>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<vbox flex="1">
|
||||
<description class="description-with-side-element">
|
||||
<html:span id="contentBlockingDescription" class="tail-with-learn-more" data-l10n-id="content-blocking-description"></html:span>
|
||||
<label id="contentBlockingLearnMore" class="learnMore text-link" data-l10n-id="content-blocking-learn-more"/>
|
||||
<label id="contentBlockingLearnMore" class="learnMore" data-l10n-id="content-blocking-learn-more" is="text-link"/>
|
||||
</description>
|
||||
</vbox>
|
||||
<vbox>
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
</hbox>
|
||||
<description class="indent">
|
||||
<html:span class="tail-with-learn-more" data-l10n-id="content-blocking-warning-description"></html:span>
|
||||
<label class="text-link content-blocking-warning-learn-how" data-l10n-id="content-blocking-learn-how"/>
|
||||
<label class="content-blocking-warning-learn-how" data-l10n-id="content-blocking-learn-how" is="text-link"/>
|
||||
</description>
|
||||
</vbox>
|
||||
</vbox>
|
||||
|
|
@ -148,7 +148,7 @@
|
|||
</hbox>
|
||||
<label id="changeBlockListLink"
|
||||
data-l10n-id="content-blocking-tracking-protection-change-block-list"
|
||||
class="text-link"
|
||||
is="text-link"
|
||||
search-l10n-ids="blocklist-window.title, blocklist-description, blocklist-button-cancel.label, blocklist-button-ok.label"/>
|
||||
<hbox class="reject-trackers-ui custom-option">
|
||||
<checkbox id="contentBlockingBlockCookiesCheckbox"
|
||||
|
|
@ -197,7 +197,7 @@
|
|||
</hbox>
|
||||
<description class="indent">
|
||||
<html:span class="tail-with-learn-more" data-l10n-id="content-blocking-warning-description"></html:span>
|
||||
<label class="text-link content-blocking-warning-learn-how" data-l10n-id="content-blocking-learn-how"/>
|
||||
<label class="content-blocking-warning-learn-how" data-l10n-id="content-blocking-learn-how" is="text-link"/>
|
||||
</description>
|
||||
</vbox>
|
||||
</vbox>
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
</vbox>
|
||||
<vbox id="doNotTrackLearnMoreBox">
|
||||
<label><label class="tail-with-learn-more" data-l10n-id="do-not-track-description" id="doNotTrackDesc"></label><label
|
||||
class="learnMore text-link" href="https://www.mozilla.org/dnt"
|
||||
class="learnMore" is="text-link" href="https://www.mozilla.org/dnt"
|
||||
data-l10n-id="do-not-track-learn-more"></label></label>
|
||||
<radiogroup id="doNotTrackRadioGroup" aria-labelledby="doNotTrackDesc" preference="privacy.donottrackheader.enabled">
|
||||
<radio value="true" data-l10n-id="do-not-track-option-always"/>
|
||||
|
|
@ -227,7 +227,7 @@
|
|||
<description class="description-with-side-element" flex="1">
|
||||
<html:span id="totalSiteDataSize" class="tail-with-learn-more"></html:span>
|
||||
<label id="siteDataLearnMoreLink"
|
||||
class="learnMore text-link" data-l10n-id="sitedata-learn-more"/>
|
||||
class="learnMore" is="text-link" data-l10n-id="sitedata-learn-more"/>
|
||||
</description>
|
||||
<hbox flex="1" id="deleteOnCloseNote" class="info-panel">
|
||||
<description flex="1" data-l10n-id="sitedata-delete-on-close-private-browsing" />
|
||||
|
|
@ -452,7 +452,7 @@
|
|||
preference="browser.urlbar.suggest.bookmark"/>
|
||||
<checkbox id="openpageSuggestion" data-l10n-id="addressbar-locbar-openpage-option"
|
||||
preference="browser.urlbar.suggest.openpage"/>
|
||||
<label class="text-link" id="openSearchEnginePreferences"
|
||||
<label id="openSearchEnginePreferences" is="text-link"
|
||||
data-l10n-id="addressbar-suggestions-settings"/>
|
||||
</groupbox>
|
||||
|
||||
|
|
@ -546,7 +546,8 @@
|
|||
class="tail-with-learn-more"
|
||||
data-l10n-id="permissions-notification"/>
|
||||
<label id="notificationPermissionsLearnMore"
|
||||
class="learnMore text-link"
|
||||
class="learnMore"
|
||||
is="text-link"
|
||||
data-l10n-id="permissions-notification-link"/>
|
||||
</description>
|
||||
<hbox pack="end">
|
||||
|
|
@ -641,7 +642,7 @@
|
|||
<checkbox id="a11yPrivacyCheckbox" class="tail-with-learn-more"
|
||||
data-l10n-id="permissions-a11y-privacy-checkbox"
|
||||
oncommand="return gPrivacyPane.updateA11yPrefs(this.checked)"/>
|
||||
<label id="a11yLearnMoreLink" class="learnMore text-link"
|
||||
<label id="a11yLearnMoreLink" class="learnMore" is="text-link"
|
||||
data-l10n-id="permissions-a11y-privacy-link"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
|
@ -663,7 +664,7 @@
|
|||
<description>
|
||||
<label class="tail-with-learn-more" data-l10n-id="collection-description"/>
|
||||
<label id="dataCollectionPrivacyNotice"
|
||||
class="learnMore text-link"
|
||||
class="learnMore" is="text-link"
|
||||
data-l10n-id="collection-privacy-notice"/>
|
||||
</description>
|
||||
<vbox data-subcategory="reports">
|
||||
|
|
@ -672,7 +673,7 @@
|
|||
data-l10n-id="collection-health-report"
|
||||
class="tail-with-learn-more"/>
|
||||
<label id="FHRLearnMore"
|
||||
class="learnMore text-link"
|
||||
class="learnMore" is="text-link"
|
||||
data-l10n-id="collection-health-report-link"/>
|
||||
<vbox class="indent">
|
||||
<hbox align="center">
|
||||
|
|
@ -682,7 +683,7 @@
|
|||
<label id="viewShieldStudies"
|
||||
href="about:studies"
|
||||
useoriginprincipal="true"
|
||||
class="learnMore text-link"
|
||||
class="learnMore" is="text-link"
|
||||
data-l10n-id="collection-studies-link"/>
|
||||
</hbox>
|
||||
|
||||
|
|
@ -691,7 +692,7 @@
|
|||
class="tail-with-learn-more"
|
||||
data-l10n-id="addon-recommendations"/>
|
||||
<label id="addonRecommendationLearnMore"
|
||||
class="learnMore text-link"
|
||||
class="learnMore" is="text-link"
|
||||
data-l10n-id="addon-recommendations-link"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
|
@ -710,7 +711,7 @@
|
|||
data-l10n-id="collection-backlogged-crash-reports"
|
||||
flex="1"/>
|
||||
<label id="crashReporterLearnMore"
|
||||
class="learnMore text-link" data-l10n-id="collection-backlogged-crash-reports-link"/>
|
||||
class="learnMore" is="text-link" data-l10n-id="collection-backlogged-crash-reports-link"/>
|
||||
</hbox>
|
||||
#endif
|
||||
</vbox>
|
||||
|
|
@ -732,7 +733,7 @@
|
|||
data-l10n-id="security-enable-safe-browsing"
|
||||
class="tail-with-learn-more"/>
|
||||
<label id="enableSafeBrowsingLearnMore"
|
||||
class="learnMore text-link" data-l10n-id="security-enable-safe-browsing-link"/>
|
||||
class="learnMore" is="text-link" data-l10n-id="security-enable-safe-browsing-link"/>
|
||||
</hbox>
|
||||
<vbox class="indent">
|
||||
<checkbox id="blockDownloads"
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
/>
|
||||
</hbox>
|
||||
<hbox id="addEnginesBox" pack="start">
|
||||
<label id="addEngines" class="text-link" data-l10n-id="search-find-more-link"></label>
|
||||
<label id="addEngines" data-l10n-id="search-find-more-link" is="text-link"></label>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
]]></box>
|
||||
|
|
|
|||
|
|
@ -185,14 +185,14 @@
|
|||
</hbox>
|
||||
</groupbox>
|
||||
<vbox align="start">
|
||||
<label id="mobilePromo-singledevice"
|
||||
class="text-link fxaMobilePromo" data-l10n-id="sync-mobilepromo-single"/>
|
||||
<label id="mobilePromo-multidevice"
|
||||
class="text-link fxaMobilePromo" data-l10n-id="sync-mobilepromo-multi"/>
|
||||
<label id="mobilePromo-singledevice" is="text-link"
|
||||
class="fxaMobilePromo" data-l10n-id="sync-mobilepromo-single"/>
|
||||
<label id="mobilePromo-multidevice" is="text-link"
|
||||
class="fxaMobilePromo" data-l10n-id="sync-mobilepromo-multi"/>
|
||||
</vbox>
|
||||
<vbox id="tosPP-small" align="start">
|
||||
<label id="tosPP-small-ToS" class="text-link" data-l10n-id="sync-tos-link"/>
|
||||
<label id="tosPP-small-PP" class="text-link" data-l10n-id="sync-fxa-privacy-notice"/>
|
||||
<label id="tosPP-small-ToS" is="text-link" data-l10n-id="sync-tos-link"/>
|
||||
<label id="tosPP-small-PP" is="text-link" data-l10n-id="sync-fxa-privacy-notice"/>
|
||||
</vbox>
|
||||
</vbox>
|
||||
</deck>
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ const mockUpdateManager = {
|
|||
|
||||
_originalClassId: "",
|
||||
|
||||
_originalFactory: null,
|
||||
|
||||
QueryInterface: ChromeUtils.generateQI([Ci.nsIUpdateManager]),
|
||||
|
||||
createInstance(outer, iiD) {
|
||||
|
|
@ -29,8 +27,6 @@ const mockUpdateManager = {
|
|||
let registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
|
||||
if (!registrar.isCIDRegistered(this._mockClassId)) {
|
||||
this._originalClassId = registrar.contractIDToCID(this.contractId);
|
||||
this._originalFactory = Cm.getClassObject(Cc[this.contractId], Ci.nsIFactory);
|
||||
registrar.unregisterFactory(this._originalClassId, this._originalFactory);
|
||||
registrar.registerFactory(this._mockClassId, "Unregister after testing", this.contractId, this);
|
||||
}
|
||||
},
|
||||
|
|
@ -38,7 +34,7 @@ const mockUpdateManager = {
|
|||
unregister() {
|
||||
let registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
|
||||
registrar.unregisterFactory(this._mockClassId, this);
|
||||
registrar.registerFactory(this._originalClassId, "", this.contractId, this._originalFactory);
|
||||
registrar.registerFactory(this._originalClassId, "", this.contractId, null);
|
||||
},
|
||||
|
||||
get updateCount() {
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
* 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/. */
|
||||
|
||||
var EXPORTED_SYMBOLS = ["WebProtocolHandlerRegistrar"];
|
||||
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
||||
const STRING_BUNDLE_URI = "chrome://browser/locale/feeds/subscribe.properties";
|
||||
|
||||
|
|
@ -146,13 +147,8 @@ WebProtocolHandlerRegistrar.prototype = {
|
|||
[addButton]);
|
||||
},
|
||||
|
||||
classID: Components.ID("{efbd7b87-9b15-4684-abf0-dc2679daadb1}"),
|
||||
|
||||
/**
|
||||
* See nsISupports
|
||||
*/
|
||||
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebProtocolHandlerRegistrar]),
|
||||
};
|
||||
|
||||
this.NSGetFactory =
|
||||
XPCOMUtils.generateNSGetFactory([WebProtocolHandlerRegistrar]);
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{efbd7b87-9b15-4684-abf0-dc2679daadb1}',
|
||||
'contract_ids': ['@mozilla.org/embeddor.implemented/web-protocol-handler-registrar;1'],
|
||||
'jsm': 'resource:///modules/WebProtocolHandlerRegistrar.jsm',
|
||||
'constructor': 'WebProtocolHandlerRegistrar',
|
||||
'processes': ProcessSelector.MAIN_PROCESS_ONLY,
|
||||
},
|
||||
]
|
||||
|
|
@ -7,8 +7,12 @@
|
|||
MOCHITEST_MANIFESTS += ['test/mochitest.ini']
|
||||
BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'WebProtocolHandlerRegistrar.js',
|
||||
EXTRA_JS_MODULES += [
|
||||
'WebProtocolHandlerRegistrar.jsm',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
with Files('**'):
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include "nsShellService.h"
|
||||
#include "nsIProcess.h"
|
||||
#include "nsICategoryManager.h"
|
||||
#include "nsBrowserCompsCID.h"
|
||||
#include "nsDirectoryServiceUtils.h"
|
||||
#include "nsAppDirectoryServiceDefs.h"
|
||||
#include "nsDirectoryServiceDefs.h"
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ function testDefaultArgs() {
|
|||
testShowNotification();
|
||||
}
|
||||
|
||||
// nsBrowserGlue.js _showUpdateNotification notification tests
|
||||
// BrowserGlue.jsm _showUpdateNotification notification tests
|
||||
const BG_NOTIFY_TESTS = [
|
||||
{
|
||||
description: "'silent showNotification' actions should not display a notification",
|
||||
|
|
@ -292,7 +292,7 @@ const BG_NOTIFY_TESTS = [
|
|||
];
|
||||
|
||||
// Test showing a notification after an update
|
||||
// _showUpdateNotification in nsBrowserGlue.js
|
||||
// _showUpdateNotification in BrowserGlue.jsm
|
||||
function testShowNotification() {
|
||||
// Catches any windows opened by these tests (e.g. alert windows) and closes
|
||||
// them
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ startupRecorder.prototype = {
|
|||
if (topic == "app-startup") {
|
||||
// We can't ensure our observer will be called first or last, so the list of
|
||||
// topics we observe here should avoid the topics used to trigger things
|
||||
// during startup (eg. the topics observed by nsBrowserGlue.js).
|
||||
// during startup (eg. the topics observed by BrowserGlue.jsm).
|
||||
let topics = [
|
||||
"profile-do-change", // This catches stuff loaded during app-startup
|
||||
"toplevel-window-ready", // Catches stuff from final-ui-startup
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class MozTranslationNotification extends MozElements.Notification {
|
|||
<description class="translation-welcome-headline" anonid="welcomeHeadline"/>
|
||||
<description class="translation-welcome-body" anonid="welcomeBody"/>
|
||||
<hbox align="center">
|
||||
<label anonid="learnMore" class="plain text-link" onclick="openTrustedLinkIn('https://support.mozilla.org/kb/automatic-translation', 'tab'); this.parentNode.parentNode.parentNode.hidePopup();"/>
|
||||
<label anonid="learnMore" class="plain" onclick="openTrustedLinkIn('https://support.mozilla.org/kb/automatic-translation', 'tab'); this.parentNode.parentNode.parentNode.hidePopup();" is="text-link"/>
|
||||
<spacer flex="1"/>
|
||||
<button class="translate-infobar-element" anonid="thanksButton" onclick="this.parentNode.parentNode.parentNode.hidePopup();"/>
|
||||
</hbox>
|
||||
|
|
|
|||
|
|
@ -236,8 +236,7 @@ let FormAutofillDoorhanger = {
|
|||
*/
|
||||
_appendPrivacyPanelLink(content, message, link) {
|
||||
let chromeDoc = content.ownerDocument;
|
||||
let privacyLinkElement = chromeDoc.createXULElement("label");
|
||||
privacyLinkElement.className = "text-link";
|
||||
let privacyLinkElement = chromeDoc.createXULElement("label", {is: "text-link"});
|
||||
privacyLinkElement.setAttribute("useoriginprincipal", true);
|
||||
privacyLinkElement.setAttribute("href", link || "about:preferences#privacy-form-autofill");
|
||||
privacyLinkElement.setAttribute("value", message);
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ FormAutofillPreferences.prototype = {
|
|||
let addressAutofill = document.createXULElement("hbox");
|
||||
let addressAutofillCheckboxGroup = document.createXULElement("hbox");
|
||||
let addressAutofillCheckbox = document.createXULElement("checkbox");
|
||||
let addressAutofillLearnMore = document.createXULElement("label");
|
||||
let addressAutofillLearnMore = document.createXULElement("label", {is: "text-link"});
|
||||
let savedAddressesBtn = document.createXULElement("button");
|
||||
// Wrappers are used to properly compute the search tooltip positions
|
||||
let savedAddressesBtnWrapper = document.createXULElement("hbox");
|
||||
|
|
@ -86,7 +86,7 @@ FormAutofillPreferences.prototype = {
|
|||
|
||||
savedAddressesBtn.className = "accessory-button";
|
||||
addressAutofillCheckbox.className = "tail-with-learn-more";
|
||||
addressAutofillLearnMore.className = "learnMore text-link";
|
||||
addressAutofillLearnMore.className = "learnMore";
|
||||
|
||||
formAutofillGroup.id = "formAutofillGroup";
|
||||
addressAutofill.id = "addressAutofill";
|
||||
|
|
@ -137,11 +137,11 @@ FormAutofillPreferences.prototype = {
|
|||
let creditCardAutofill = document.createXULElement("hbox");
|
||||
let creditCardAutofillCheckboxGroup = document.createXULElement("hbox");
|
||||
let creditCardAutofillCheckbox = document.createXULElement("checkbox");
|
||||
let creditCardAutofillLearnMore = document.createXULElement("label");
|
||||
let creditCardAutofillLearnMore = document.createXULElement("label", {is: "text-link"});
|
||||
let savedCreditCardsBtn = document.createXULElement("button");
|
||||
savedCreditCardsBtn.className = "accessory-button";
|
||||
creditCardAutofillCheckbox.className = "tail-with-learn-more";
|
||||
creditCardAutofillLearnMore.className = "learnMore text-link";
|
||||
creditCardAutofillLearnMore.className = "learnMore";
|
||||
|
||||
creditCardAutofill.id = "creditCardAutofill";
|
||||
creditCardAutofillLearnMore.id = "creditCardAutofillLearnMore";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{d0c5195d-e798-49d4-b1d3-9324328b2291}',
|
||||
'contract_ids': [
|
||||
'@mozilla.org/streamconv;1?from=application/pdf&to=*/*',
|
||||
'@mozilla.org/streamconv;1?from=application/pdf&to=text/html',
|
||||
],
|
||||
'jsm': 'resource:///modules/pdfjs.js',
|
||||
'constructor': 'StreamConverterFactory',
|
||||
},
|
||||
]
|
||||
|
|
@ -109,7 +109,7 @@ var PdfJs = {
|
|||
|
||||
earlyInit() {
|
||||
// Note: Please keep this in sync with the duplicated logic in
|
||||
// nsBrowserGlue.js.
|
||||
// BrowserGlue.jsm.
|
||||
Services.ppmm.sharedData.set("pdfjs.enabled", this.checkEnabled());
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,10 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
|
|||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
EXTRA_JS_MODULES += [
|
||||
'pdfjs.js',
|
||||
'pdfjs.manifest',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
"use strict";
|
||||
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
||||
ChromeUtils.defineModuleGetter(this, "PdfStreamConverter",
|
||||
"resource://pdf.js/PdfStreamConverter.jsm");
|
||||
|
|
@ -28,10 +27,5 @@ function StreamConverterFactory() {
|
|||
}
|
||||
throw Cr.NS_ERROR_FACTORY_NOT_REGISTERED;
|
||||
}
|
||||
StreamConverterFactory.prototype = {
|
||||
// properties required for XPCOM registration:
|
||||
classID: Components.ID("{d0c5195d-e798-49d4-b1d3-9324328b2291}"),
|
||||
classDescription: "pdf.js Component",
|
||||
};
|
||||
|
||||
var NSGetFactory = XPCOMUtils.generateNSGetFactory([StreamConverterFactory]);
|
||||
var EXPORTED_SYMBOLS = ["StreamConverterFactory"];
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
component {d0c5195d-e798-49d4-b1d3-9324328b2291} pdfjs.js
|
||||
contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {d0c5195d-e798-49d4-b1d3-9324328b2291}
|
||||
contract @mozilla.org/streamconv;1?from=application/pdf&to=text/html {d0c5195d-e798-49d4-b1d3-9324328b2291}
|
||||
|
|
@ -160,169 +160,30 @@
|
|||
#endif
|
||||
|
||||
; JavaScript components
|
||||
@RESPATH@/components/ConsoleAPI.manifest
|
||||
@RESPATH@/components/ConsoleAPIStorage.js
|
||||
@RESPATH@/components/BrowserElementParent.manifest
|
||||
@RESPATH@/components/BrowserElementParent.js
|
||||
@RESPATH@/components/UAOverridesBootstrapper.js
|
||||
@RESPATH@/components/UAOverridesBootstrapper.manifest
|
||||
@RESPATH@/components/WellKnownOpportunisticUtils.js
|
||||
@RESPATH@/components/WellKnownOpportunisticUtils.manifest
|
||||
#ifndef XP_MACOSX
|
||||
; OSX uses native platform impl. Windows, Linux, and Android uses fallback JS impl.
|
||||
@BINPATH@/components/nsDNSServiceDiscovery.manifest
|
||||
@BINPATH@/components/nsDNSServiceDiscovery.js
|
||||
#endif
|
||||
@RESPATH@/browser/components/BrowserComponents.manifest
|
||||
@RESPATH@/browser/components/nsBrowserContentHandler.js
|
||||
@RESPATH@/browser/components/nsBrowserGlue.js
|
||||
@RESPATH@/browser/components/devtools-startup.manifest
|
||||
@RESPATH@/browser/components/devtools-startup.js
|
||||
@RESPATH@/browser/components/aboutdebugging-registration.js
|
||||
@RESPATH@/browser/components/aboutdebugging.manifest
|
||||
#ifdef NIGHTLY_BUILD
|
||||
@RESPATH@/browser/components/aboutdebugging-new-registration.js
|
||||
@RESPATH@/browser/components/aboutdebugging-new.manifest
|
||||
#endif
|
||||
@RESPATH@/browser/components/aboutdevtools-registration.js
|
||||
@RESPATH@/browser/components/aboutdevtools.manifest
|
||||
@RESPATH@/browser/components/aboutdevtoolstoolbox-registration.js
|
||||
@RESPATH@/browser/components/aboutdevtoolstoolbox.manifest
|
||||
@RESPATH@/browser/components/aboutNewTabService.js
|
||||
@RESPATH@/browser/components/NewTabComponents.manifest
|
||||
@RESPATH@/browser/components/EnterprisePolicies.js
|
||||
@RESPATH@/browser/components/EnterprisePoliciesContent.js
|
||||
@RESPATH@/browser/components/EnterprisePolicies.manifest
|
||||
@RESPATH@/browser/components/WebProtocolHandlerRegistrar.js
|
||||
@RESPATH@/components/Downloads.manifest
|
||||
@RESPATH@/components/DownloadLegacy.js
|
||||
@RESPATH@/components/PageThumbsComponents.manifest
|
||||
@RESPATH@/components/crashmonitor.manifest
|
||||
@RESPATH@/components/nsCrashMonitor.js
|
||||
@RESPATH@/components/toolkitsearch.manifest
|
||||
@RESPATH@/components/nsSearchService.js
|
||||
@RESPATH@/components/nsSearchSuggestions.js
|
||||
@RESPATH@/components/nsSidebar.js
|
||||
#ifdef NIGHTLY_BUILD
|
||||
@RESPATH@/browser/components/payments.manifest
|
||||
@RESPATH@/browser/components/paymentUIService.js
|
||||
#endif
|
||||
@RESPATH@/components/passwordmgr.manifest
|
||||
@RESPATH@/components/nsLoginInfo.js
|
||||
@RESPATH@/components/nsLoginManager.js
|
||||
@RESPATH@/components/nsLoginManagerPrompter.js
|
||||
@RESPATH@/components/storage-json.js
|
||||
@RESPATH@/components/crypto-SDR.js
|
||||
@RESPATH@/components/TooltipTextProvider.js
|
||||
@RESPATH@/components/TooltipTextProvider.manifest
|
||||
@RESPATH@/components/WebVTT.manifest
|
||||
@RESPATH@/components/WebVTTParserWrapper.js
|
||||
@RESPATH@/components/nsHelperAppDlg.manifest
|
||||
@RESPATH@/components/nsHelperAppDlg.js
|
||||
@RESPATH@/components/NetworkGeolocationProvider.manifest
|
||||
@RESPATH@/components/NetworkGeolocationProvider.js
|
||||
@RESPATH@/components/extensions.manifest
|
||||
@RESPATH@/components/addonManager.js
|
||||
@RESPATH@/components/amContentHandler.js
|
||||
@RESPATH@/components/amInstallTrigger.js
|
||||
@RESPATH@/components/amWebAPI.js
|
||||
#ifdef MOZ_UPDATER
|
||||
@RESPATH@/components/nsUpdateService.manifest
|
||||
@RESPATH@/components/nsUpdateService.js
|
||||
@RESPATH@/components/nsUpdateServiceStub.js
|
||||
#endif
|
||||
@RESPATH@/components/nsUpdateTimerManager.manifest
|
||||
@RESPATH@/components/nsUpdateTimerManager.js
|
||||
@RESPATH@/components/utils.manifest
|
||||
@RESPATH@/components/simpleServices.js
|
||||
@RESPATH@/components/ProcessSingleton.manifest
|
||||
@RESPATH@/components/MainProcessSingleton.js
|
||||
@RESPATH@/components/ContentProcessSingleton.js
|
||||
@RESPATH@/components/nsURLFormatter.manifest
|
||||
@RESPATH@/components/nsURLFormatter.js
|
||||
@RESPATH@/components/toolkitplaces.manifest
|
||||
@RESPATH@/components/nsTaggingService.js
|
||||
@RESPATH@/components/UnifiedComplete.js
|
||||
@RESPATH@/components/nsPlacesExpiration.js
|
||||
@RESPATH@/components/PageIconProtocolHandler.js
|
||||
@RESPATH@/components/PlacesCategoriesStarter.js
|
||||
@RESPATH@/components/ColorAnalyzer.js
|
||||
@RESPATH@/components/PageThumbsStorageService.js
|
||||
@RESPATH@/components/mozProtocolHandler.js
|
||||
@RESPATH@/components/mozProtocolHandler.manifest
|
||||
@RESPATH@/components/nsDefaultCLH.manifest
|
||||
@RESPATH@/components/nsDefaultCLH.js
|
||||
@RESPATH@/components/ContentPrefService2.manifest
|
||||
@RESPATH@/components/ContentPrefService2.js
|
||||
@RESPATH@/components/nsContentDispatchChooser.manifest
|
||||
@RESPATH@/components/nsContentDispatchChooser.js
|
||||
@RESPATH@/components/HandlerService.manifest
|
||||
@RESPATH@/components/HandlerService.js
|
||||
@RESPATH@/components/nsWebHandlerApp.manifest
|
||||
@RESPATH@/components/nsWebHandlerApp.js
|
||||
@RESPATH@/components/satchel.manifest
|
||||
@RESPATH@/components/nsFormAutoComplete.js
|
||||
@RESPATH@/components/FormHistoryStartup.js
|
||||
@RESPATH@/components/nsInputListAutoComplete.js
|
||||
@RESPATH@/components/contentAreaDropListener.manifest
|
||||
@RESPATH@/components/contentAreaDropListener.js
|
||||
@RESPATH@/browser/components/BrowserProfileMigrators.manifest
|
||||
@RESPATH@/browser/components/ProfileMigrator.js
|
||||
@RESPATH@/browser/components/ChromeProfileMigrator.js
|
||||
@RESPATH@/browser/components/FirefoxProfileMigrator.js
|
||||
#ifdef XP_WIN
|
||||
@RESPATH@/browser/components/360seProfileMigrator.js
|
||||
@RESPATH@/browser/components/EdgeProfileMigrator.js
|
||||
@RESPATH@/browser/components/IEProfileMigrator.js
|
||||
#endif
|
||||
#ifdef XP_MACOSX
|
||||
@RESPATH@/browser/components/SafariProfileMigrator.js
|
||||
@RESPATH@/browser/components/MacTouchBar.manifest
|
||||
@RESPATH@/browser/components/MacTouchBar.js
|
||||
#endif
|
||||
@RESPATH@/components/nsPrompter.manifest
|
||||
@RESPATH@/components/nsPrompter.js
|
||||
@RESPATH@/components/SyncComponents.manifest
|
||||
@RESPATH@/components/Weave.js
|
||||
@RESPATH@/components/FxAccountsComponents.manifest
|
||||
@RESPATH@/components/FxAccountsPush.js
|
||||
@RESPATH@/components/CaptivePortalDetectComponents.manifest
|
||||
@RESPATH@/components/captivedetect.js
|
||||
@RESPATH@/components/servicesComponents.manifest
|
||||
@RESPATH@/components/servicesSettings.manifest
|
||||
@RESPATH@/components/RemoteSettingsComponents.js
|
||||
@RESPATH@/components/cryptoComponents.manifest
|
||||
@RESPATH@/components/TelemetryStartup.js
|
||||
@RESPATH@/components/TelemetryStartup.manifest
|
||||
@RESPATH@/components/XULStore.js
|
||||
@RESPATH@/components/XULStore.manifest
|
||||
@RESPATH@/components/recording-cmdline.js
|
||||
@RESPATH@/components/recording-cmdline.manifest
|
||||
@RESPATH@/components/htmlMenuBuilder.js
|
||||
@RESPATH@/components/htmlMenuBuilder.manifest
|
||||
|
||||
@RESPATH@/components/NotificationStorage.js
|
||||
@RESPATH@/components/NotificationStorage.manifest
|
||||
@RESPATH@/components/Push.js
|
||||
@RESPATH@/components/Push.manifest
|
||||
@RESPATH@/components/PushComponents.js
|
||||
|
||||
@RESPATH@/components/remotebrowserutils.manifest
|
||||
@RESPATH@/components/RemoteWebNavigation.js
|
||||
|
||||
@RESPATH@/components/ProcessSelector.js
|
||||
@RESPATH@/components/ProcessSelector.manifest
|
||||
|
||||
@RESPATH@/components/SlowScriptDebug.manifest
|
||||
@RESPATH@/components/SlowScriptDebug.js
|
||||
|
||||
@RESPATH@/components/ClearDataService.manifest
|
||||
@RESPATH@/components/ClearDataService.js
|
||||
|
||||
#ifdef MOZ_WEBRTC
|
||||
@RESPATH@/components/PeerConnection.js
|
||||
@RESPATH@/components/PeerConnection.manifest
|
||||
#endif
|
||||
|
||||
; Remote control protocol
|
||||
#ifdef ENABLE_MARIONETTE
|
||||
|
|
@ -333,17 +194,6 @@
|
|||
@RESPATH@/defaults/pref/marionette.js
|
||||
#endif
|
||||
|
||||
@RESPATH@/components/nsAsyncShutdown.manifest
|
||||
@RESPATH@/components/nsAsyncShutdown.js
|
||||
|
||||
@RESPATH@/components/BuiltinProviders.manifest
|
||||
@RESPATH@/components/PresentationControlService.js
|
||||
@RESPATH@/components/PresentationDataChannelSessionTransport.js
|
||||
@RESPATH@/components/PresentationDataChannelSessionTransport.manifest
|
||||
|
||||
@RESPATH@/components/mozIntl.manifest
|
||||
@RESPATH@/components/mozIntl.js
|
||||
|
||||
#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
|
||||
@RESPATH@/components/TestInterfaceJS.js
|
||||
@RESPATH@/components/TestInterfaceJS.manifest
|
||||
|
|
@ -359,26 +209,12 @@
|
|||
@RESPATH@/components/extensions-toolkit.manifest
|
||||
@RESPATH@/browser/components/extensions-browser.manifest
|
||||
|
||||
; [Normandy]
|
||||
@RESPATH@/components/shield.manifest
|
||||
@RESPATH@/components/shield-content-process.js
|
||||
|
||||
; [PDF Viewer]
|
||||
@RESPATH@/browser/components/pdfjs.manifest
|
||||
@RESPATH@/browser/components/pdfjs.js
|
||||
|
||||
; Modules
|
||||
@RESPATH@/browser/modules/*
|
||||
@RESPATH@/modules/*
|
||||
@RESPATH@/browser/actors/*
|
||||
@RESPATH@/actors/*
|
||||
|
||||
; Safe Browsing
|
||||
@RESPATH@/components/nsURLClassifier.manifest
|
||||
@RESPATH@/components/nsUrlClassifierHashCompleter.js
|
||||
@RESPATH@/components/nsUrlClassifierListManager.js
|
||||
@RESPATH@/components/nsUrlClassifierLib.js
|
||||
|
||||
; Security Reports
|
||||
@RESPATH@/components/SecurityReporter.manifest
|
||||
@RESPATH@/components/SecurityReporter.js
|
||||
|
|
@ -564,8 +400,6 @@ bin/libfreebl_32int64_3.so
|
|||
; [Crash Reporter]
|
||||
;
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
@RESPATH@/components/CrashService.manifest
|
||||
@RESPATH@/components/CrashService.js
|
||||
#ifdef XP_MACOSX
|
||||
@BINPATH@/crashreporter.app/
|
||||
#else
|
||||
|
|
@ -587,7 +421,6 @@ bin/libfreebl_32int64_3.so
|
|||
@BINPATH@/pingsender@BIN_SUFFIX@
|
||||
|
||||
; Shutdown Terminator
|
||||
@RESPATH@/components/nsTerminatorTelemetry.js
|
||||
@RESPATH@/components/terminator.manifest
|
||||
|
||||
#ifdef LLVM_SYMBOLIZER
|
||||
|
|
@ -607,12 +440,6 @@ bin/libfreebl_32int64_3.so
|
|||
@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@
|
||||
@RESPATH@/gmp-clearkey/0.1/manifest.json
|
||||
|
||||
; gfx
|
||||
#ifdef XP_WIN
|
||||
@RESPATH@/components/GfxSanityTest.manifest
|
||||
@RESPATH@/components/SanityTest.js
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_DMD
|
||||
; DMD
|
||||
@RESPATH@/dmd.py
|
||||
|
|
@ -625,13 +452,6 @@ bin/libfreebl_32int64_3.so
|
|||
#endif
|
||||
#endif
|
||||
|
||||
; NOTE: This must match the config checks in
|
||||
; /toolkit/components/backgroundhangmonitor/moz.build.
|
||||
#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN) && !defined(MOZ_ASAN)
|
||||
@RESPATH@/components/BHRTelemetryService.js
|
||||
@RESPATH@/components/BHRTelemetryService.manifest
|
||||
#endif
|
||||
|
||||
#ifdef PKG_LOCALE_MANIFEST
|
||||
#include @PKG_LOCALE_MANIFEST@
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -484,19 +484,6 @@ Section "-Application" APP_IDX
|
|||
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
|
||||
${CreateRegKey} "$TmpVal" "$0" 0
|
||||
|
||||
; MaxLoaderThreads option is only required on AArch64 (ARM64) and it can only
|
||||
; be set in HKEY_LOCAL_MACHINE.
|
||||
${If} "${ARCH}" == "AArch64"
|
||||
${AndIf} $TmpVal == "HKLM"
|
||||
StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\${FileMainEXE}"
|
||||
${CreateRegKey} "$TmpVal" "$0" 0
|
||||
${WriteRegDWORD2} $TmpVal "$0" "MaxLoaderThreads" 1 0
|
||||
|
||||
StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\plugin-container.exe"
|
||||
${CreateRegKey} "$TmpVal" "$0" 0
|
||||
${WriteRegDWORD2} $TmpVal "$0" "MaxLoaderThreads" 1 0
|
||||
${EndIf}
|
||||
|
||||
${If} $TmpVal == "HKLM"
|
||||
; Set the permitted LSP Categories
|
||||
${SetAppLSPCategories} ${LSP_CATEGORIES}
|
||||
|
|
|
|||
|
|
@ -58,6 +58,17 @@
|
|||
${If} "$0" != "${GREVersion}"
|
||||
WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
|
||||
${EndIf}
|
||||
|
||||
; Image File Execution Options were set for a short period on AArch64 (ARM64)
|
||||
; to disable multi-threaded DLL loading, which breaks with the sandbox.
|
||||
; A better solution was found, so this code is to clean up any entries left
|
||||
; lying around. Bug 1525981 tracks removing this.
|
||||
${If} "${ARCH}" == "AArch64"
|
||||
StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\${FileMainEXE}"
|
||||
DeleteRegKey HKLM "$0"
|
||||
StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\plugin-container.exe"
|
||||
DeleteRegKey HKLM "$0"
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
|
||||
; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).
|
||||
|
|
|
|||
|
|
@ -373,13 +373,6 @@ Section "Uninstall"
|
|||
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox"
|
||||
DeleteRegKey HKLM "$0"
|
||||
DeleteRegKey HKCU "$0"
|
||||
; Image File Execution Options are only set on AArch64 (ARM64).
|
||||
${If} "${ARCH}" == "AArch64"
|
||||
StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\${FileMainEXE}"
|
||||
DeleteRegKey HKLM "$0"
|
||||
StrCpy $0 "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\plugin-container.exe"
|
||||
DeleteRegKey HKLM "$0"
|
||||
${EndIf}
|
||||
${Else}
|
||||
ReadRegStr $R1 HKLM "$0" ""
|
||||
${un.RemoveQuotesFromPath} "$R1" $R1
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
|
|||
"resource://gre/modules/PrivateBrowsingUtils.jsm");
|
||||
|
||||
var ContentClick = {
|
||||
// Listeners are added in nsBrowserGlue.js
|
||||
// Listeners are added in BrowserGlue.jsm
|
||||
receiveMessage(message) {
|
||||
switch (message.name) {
|
||||
case "Content:Click":
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ var ContentSearch = {
|
|||
});
|
||||
},
|
||||
|
||||
// Listeners and observers are added in nsBrowserGlue.js
|
||||
// Listeners and observers are added in BrowserGlue.jsm
|
||||
receiveMessage(msg) {
|
||||
// Add a temporary event handler that exists only while the message is in
|
||||
// the event queue. If the message's source docshell changes browsers in
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ var FormValidationHandler =
|
|||
* Events
|
||||
*/
|
||||
|
||||
// Listeners are added in nsBrowserGlue.js
|
||||
// Listeners are added in BrowserGlue.jsm
|
||||
receiveMessage(aMessage) {
|
||||
let window = aMessage.target.ownerGlobal;
|
||||
let json = aMessage.json;
|
||||
|
|
|
|||
|
|
@ -458,8 +458,7 @@ var ProcessHangMonitor = {
|
|||
let linkText = bundle.getString("processHang.add-on.learn-more.text");
|
||||
let linkURL = "https://support.mozilla.org/kb/warning-unresponsive-script#w_other-causes";
|
||||
|
||||
let link = doc.createXULElement("label");
|
||||
link.setAttribute("class", "text-link");
|
||||
let link = doc.createXULElement("label", {is: "text-link"});
|
||||
link.setAttribute("role", "link");
|
||||
link.setAttribute("onclick", `openTrustedLinkIn(${JSON.stringify(linkURL)}, "tab")`);
|
||||
link.setAttribute("value", linkText);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ ChromeUtils.defineModuleGetter(this, "ReaderMode", "resource://gre/modules/Reade
|
|||
const gStringBundle = Services.strings.createBundle("chrome://global/locale/aboutReader.properties");
|
||||
|
||||
var ReaderParent = {
|
||||
// Listeners are added in nsBrowserGlue.js
|
||||
// Listeners are added in BrowserGlue.jsm
|
||||
receiveMessage(message) {
|
||||
switch (message.name) {
|
||||
case "Reader:FaviconRequest": {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ ChromeUtils.defineModuleGetter(this, "Services",
|
|||
"resource://gre/modules/Services.jsm");
|
||||
|
||||
var RemotePrompt = {
|
||||
// Listeners are added in nsBrowserGlue.js
|
||||
// Listeners are added in BrowserGlue.jsm
|
||||
receiveMessage(message) {
|
||||
switch (message.name) {
|
||||
case "Prompt:Open":
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ var webrtcUI = {
|
|||
return this.emitter.off(...args);
|
||||
},
|
||||
|
||||
// Listeners and observers are registered in nsBrowserGlue.js
|
||||
// Listeners and observers are registered in BrowserGlue.jsm
|
||||
receiveMessage(aMessage) {
|
||||
switch (aMessage.name) {
|
||||
case "rtcpeer:Request": {
|
||||
|
|
@ -719,8 +719,7 @@ function prompt(aBrowser, aRequest) {
|
|||
let baseURL =
|
||||
Services.urlFormatter.formatURLPref("app.support.baseURL");
|
||||
|
||||
let learnMore = chromeWin.document.createXULElement("label");
|
||||
learnMore.className = "text-link";
|
||||
let learnMore = chromeWin.document.createXULElement("label", {is: "text-link"});
|
||||
learnMore.setAttribute("href", baseURL + "screenshare-safety");
|
||||
learnMore.textContent = learnMoreText;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
:root:-moz-lwtheme-brighttext {
|
||||
/* !important to override LightweightThemeManager.addBuiltInTheme in
|
||||
nsBrowserGlue.js */
|
||||
BrowserGlue.jsm */
|
||||
--autocomplete-popup-background: #2A2A2E !important;
|
||||
--autocomplete-popup-highlight-background: #0060DF;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,6 +102,12 @@ Class definitions may have the following properties:
|
|||
|
||||
This property is incompatible with ``legacy_constructor``.
|
||||
|
||||
``jsm`` (optional)
|
||||
If provided, must be the URL of a JavaScript module which contains a
|
||||
JavaScript implementation of the component. The ``constructor`` property
|
||||
must contain the name of an exported function which can be constructed to
|
||||
create a new instance of the component.
|
||||
|
||||
``legacy_constructor`` (optional)
|
||||
This property is deprecated, and should not be used in new code.
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ function run_test() {
|
|||
factory: Components.manager.getClassObject(Cc[factory.contractID], Ci.nsIFactory),
|
||||
});
|
||||
old_factories_inds.push(true);
|
||||
registrar.unregisterFactory(old_factories[i].CID, old_factories[i].factory);
|
||||
} else {
|
||||
dump(factory.scheme + " has never been registered. Registering...");
|
||||
old_factories.push({CID: "", factory: null});
|
||||
|
|
@ -95,7 +94,7 @@ function run_test() {
|
|||
|
||||
if (ind) {
|
||||
let old_factory = old_factories[i];
|
||||
registrar.registerFactory(old_factory.CID, factory.scheme, factory.contractID, old_factory.factory);
|
||||
registrar.registerFactory(old_factory.CID, factory.scheme, factory.contractID, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,7 +125,6 @@ function run_test() {
|
|||
dump(XULAppInfoFactory.scheme + " is already registered. Storing currently registered object for restoration later.");
|
||||
old_factory.CID = registrar.contractIDToCID(XULAppInfoFactory.contractID);
|
||||
old_factory.factory = Components.manager.getClassObject(Cc[XULAppInfoFactory.contractID], Ci.nsIFactory);
|
||||
registrar.unregisterFactory(old_factory.CID, old_factory.factory);
|
||||
} else {
|
||||
dump(XULAppInfoFactory.scheme + " has never been registered. Registering...");
|
||||
}
|
||||
|
|
@ -214,6 +213,6 @@ function run_test() {
|
|||
// Unregister XULAppInfoFactory
|
||||
registrar.unregisterFactory(XULAppInfoFactory.CID, XULAppInfoFactory);
|
||||
if (old_factory.factory != null) {
|
||||
registrar.registerFactory(old_factory.CID, "", XULAppInfoFactory.contractID, old_factory.factory);
|
||||
registrar.registerFactory(old_factory.CID, "", XULAppInfoFactory.contractID, null);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
// open the new about:debugging when going to about:debugging-new, without having to flip
|
||||
// the preference. This allows running both versions of about:debugging side by side to
|
||||
// compare them.
|
||||
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
const { nsIAboutModule } = Ci;
|
||||
|
|
@ -38,6 +37,4 @@ AboutDebuggingNew.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
|
||||
AboutDebuggingNew,
|
||||
]);
|
||||
var EXPORTED_SYMBOLS = ["AboutDebuggingNew"];
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
// workers and tabs by launching a dedicated DevTools toolbox for the selected target.
|
||||
// If DevTools are not installed, this about page will display a shim landing page
|
||||
// encouraging the user to download and install DevTools.
|
||||
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
const { nsIAboutModule } = Ci;
|
||||
|
|
@ -40,6 +39,4 @@ AboutDebugging.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
|
||||
AboutDebugging,
|
||||
]);
|
||||
var EXPORTED_SYMBOLS = ["AboutDebugging"];
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
// Register about:devtools-toolbox which allows to open a devtools toolbox
|
||||
// in a Firefox tab or a custom html iframe in browser.html
|
||||
|
||||
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
const { nsIAboutModule } = Ci;
|
||||
|
|
@ -35,6 +34,4 @@ AboutDevtoolsToolbox.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
|
||||
AboutDevtoolsToolbox,
|
||||
]);
|
||||
var EXPORTED_SYMBOLS = ["AboutDevtoolsToolbox"];
|
||||
|
|
@ -1007,5 +1007,4 @@ const JsonView = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(
|
||||
[DevToolsStartup]);
|
||||
var EXPORTED_SYMBOLS = ["DevToolsStartup"];
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
component {610e4e26-26bd-4a7d-aebc-69211d5a3be0} aboutdebugging-new-registration.js
|
||||
contract @mozilla.org/network/protocol/about;1?what=debugging-new {610e4e26-26bd-4a7d-aebc-69211d5a3be0}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
component {1060afaf-dc9e-43da-8646-23a2faf48493} aboutdebugging-registration.js
|
||||
contract @mozilla.org/network/protocol/about;1?what=debugging {1060afaf-dc9e-43da-8646-23a2faf48493}
|
||||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
// Register the about:devtools URL, that is opened whenever a user attempts to open
|
||||
// DevTools for the first time.
|
||||
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
const { nsIAboutModule } = Ci;
|
||||
|
|
@ -35,6 +34,4 @@ AboutDevtools.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
|
||||
AboutDevtools,
|
||||
]);
|
||||
var EXPORTED_SYMBOLS = ["AboutDevtools"];
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
component {3a16d383-92bd-4c24-ac10-0e2bd66883ab} aboutdevtools-registration.js
|
||||
contract @mozilla.org/network/protocol/about;1?what=devtools {3a16d383-92bd-4c24-ac10-0e2bd66883ab}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = [
|
||||
{
|
||||
'cid': '{3a16d383-92bd-4c24-ac10-0e2bd66883ab}',
|
||||
'contract_ids': ['@mozilla.org/network/protocol/about;1?what=devtools'],
|
||||
'jsm': 'resource:///modules/AboutDevToolsRegistration.jsm',
|
||||
'constructor': 'AboutDevtools',
|
||||
},
|
||||
]
|
||||
|
|
@ -4,9 +4,12 @@
|
|||
# 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/.
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
'aboutdevtools-registration.js',
|
||||
'aboutdevtools.manifest',
|
||||
EXTRA_JS_MODULES += [
|
||||
'AboutDevToolsRegistration.jsm',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
component {11342911-3135-45a8-8d71-737a2b0ad469} aboutdevtoolstoolbox-registration.js
|
||||
contract @mozilla.org/network/protocol/about;1?what=devtools-toolbox {11342911-3135-45a8-8d71-737a2b0ad469}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# 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/.
|
||||
|
||||
Classes = []
|
||||
|
||||
if buildconfig.substs['MOZ_DEVTOOLS'] == 'all':
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}',
|
||||
'contract_ids': ['@mozilla.org/devtools/startup-clh;1'],
|
||||
'jsm': 'resource:///modules/DevToolsStartup.jsm',
|
||||
'constructor': 'DevToolsStartup',
|
||||
'categories': {'command-line-handler': 'm-devtools'},
|
||||
},
|
||||
{
|
||||
'cid': '{1060afaf-dc9e-43da-8646-23a2faf48493}',
|
||||
'contract_ids': ['@mozilla.org/network/protocol/about;1?what=debugging'],
|
||||
'jsm': 'resource:///modules/AboutDebuggingRegistration.jsm',
|
||||
'constructor': 'AboutDebugging',
|
||||
},
|
||||
{
|
||||
'cid': '{11342911-3135-45a8-8d71-737a2b0ad469}',
|
||||
'contract_ids': ['@mozilla.org/network/protocol/about;1?what=devtools-toolbox'],
|
||||
'jsm': 'resource:///modules/AboutDevToolsToolboxRegistration.jsm',
|
||||
'constructor': 'AboutDevtoolsToolbox',
|
||||
},
|
||||
]
|
||||
|
||||
if defined('NIGHTLY_BUILD'):
|
||||
Classes += [
|
||||
{
|
||||
'cid': '{610e4e26-26bd-4a7d-aebc-69211d5a3be0}',
|
||||
'contract_ids': ['@mozilla.org/network/protocol/about;1?what=debugging-new'],
|
||||
'jsm': 'resource:///modules/AboutDebuggingNewRegistration.jsm',
|
||||
'constructor': 'AboutDebuggingNew',
|
||||
},
|
||||
]
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
component {9e9a9283-0ce9-4e4a-8f1c-ba129a032c32} devtools-startup.js
|
||||
contract @mozilla.org/devtools/startup-clh;1 {9e9a9283-0ce9-4e4a-8f1c-ba129a032c32}
|
||||
category command-line-handler m-devtools @mozilla.org/devtools/startup-clh;1
|
||||
|
|
@ -12,13 +12,10 @@ DIRS += [
|
|||
|
||||
# Register the startup components only for 'all' builds.
|
||||
if CONFIG['MOZ_DEVTOOLS'] == 'all':
|
||||
EXTRA_COMPONENTS += [
|
||||
'aboutdebugging-registration.js',
|
||||
'aboutdebugging.manifest',
|
||||
'aboutdevtoolstoolbox-registration.js',
|
||||
'aboutdevtoolstoolbox.manifest',
|
||||
'devtools-startup.js',
|
||||
'devtools-startup.manifest',
|
||||
EXTRA_JS_MODULES += [
|
||||
'AboutDebuggingRegistration.jsm',
|
||||
'AboutDevToolsToolboxRegistration.jsm',
|
||||
'DevToolsStartup.jsm',
|
||||
]
|
||||
|
||||
DIRS += [
|
||||
|
|
@ -28,10 +25,13 @@ if CONFIG['MOZ_DEVTOOLS'] == 'all':
|
|||
|
||||
if CONFIG['NIGHTLY_BUILD']:
|
||||
EXTRA_COMPONENTS += [
|
||||
'aboutdebugging-new-registration.js',
|
||||
'aboutdebugging-new.manifest',
|
||||
'AboutDebuggingNewRegistration.jsm',
|
||||
]
|
||||
|
||||
XPCOM_MANIFESTS += [
|
||||
'components.conf',
|
||||
]
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
|
||||
|
||||
if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
||||
|
||||
// This component is used for handling dragover and drop of urls.
|
||||
|
|
@ -315,5 +314,4 @@ ContentAreaDropListener.prototype =
|
|||
}
|
||||
};
|
||||
|
||||
var components = [ContentAreaDropListener];
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
|
||||
var EXPORTED_SYMBOLS = ["ContentAreaDropListener"];
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
* 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/. */
|
||||
|
||||
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
||||
// Fills up aProcesses until max and then selects randomly from the available
|
||||
// ones.
|
||||
function RandomSelector() {
|
||||
|
|
@ -68,5 +66,4 @@ MinTabSelector.prototype = {
|
|||
},
|
||||
};
|
||||
|
||||
var components = [RandomSelector, MinTabSelector];
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
|
||||
var EXPORTED_SYMBOLS = ["RandomSelector", "MinTabSelector"]
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
component {c616fcfd-9737-41f1-aa74-cee72a38f91b} ProcessSelector.js
|
||||
component {2dc08eaf-6eef-4394-b1df-a3a927c1290b} ProcessSelector.js
|
||||
contract @mozilla.org/ipc/processselector;1 {2dc08eaf-6eef-4394-b1df-a3a927c1290b}
|
||||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче