Commit bb97eb46 authored by Kris Maglione's avatar Kris Maglione
Browse files

Bug 1524688: Part 2 - Convert BrowserGlue and friends to static registration. r=mconley

--HG--
rename : browser/components/nsBrowserContentHandler.js => browser/components/BrowserContentHandler.jsm
rename : browser/components/nsBrowserGlue.js => browser/components/BrowserGlue.jsm
rename : browser/components/protocolhandler/WebProtocolHandlerRegistrar.js => browser/components/protocolhandler/WebProtocolHandlerRegistrar.jsm
extra : source : 9201a7ea3c543310df1612b57ab72b883c94e07e
parent 824f4907
......@@ -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;
}
......
......@@ -86,14 +86,16 @@ BrowserCLH.prototype = {
GeckoViewUtils.addLazyGetter(this, "LoginManagerParent", {
module: "resource://gre/modules/LoginManagerParent.jsm",
mm: [
// PLEASE KEEP THIS LIST IN SYNC WITH THE DESKTOP LIST IN nsBrowserGlue.js
// PLEASE KEEP THIS LIST IN SYNC WITH THE DESKTOP LIST IN
// BrowserGlue.jsm
"RemoteLogins:findLogins",
"RemoteLogins:findRecipes",
"RemoteLogins:onFormSubmit",
"RemoteLogins:autoCompleteLogins",
"RemoteLogins:removeLogin",
"RemoteLogins:insecureLoginFormPresent",
// PLEASE KEEP THIS LIST IN SYNC WITH THE DESKTOP LIST IN nsBrowserGlue.js
// PLEASE KEEP THIS LIST IN SYNC WITH THE DESKTOP LIST IN
// BrowserGlue.jsm
],
});
GeckoViewUtils.addLazyGetter(this, "LoginManagerContent", {
......
......@@ -289,10 +289,6 @@ class TestUrlFinder(unittest.TestCase):
'path1',
None
],
'dist/bin/browser/components/nsBrowserGlue.js': [
'path2',
None
],
'dist/bin/browser/features/firefox@getpocket.com/bootstrap.js': [
'path4',
None
......@@ -334,7 +330,6 @@ class TestUrlFinder(unittest.TestCase):
paths = [
('jar:file:///home/worker/workspace/build/application/' + app_name + '/' + omnijar_name + '!/components/MainProcessSingleton.js', 'path1'),
('jar:file:///home/worker/workspace/build/application/' + app_name + '/browser/' + omnijar_name + '!/components/nsBrowserGlue.js', 'path2'),
('jar:file:///home/worker/workspace/build/application/' + app_name + '/browser/features/firefox@getpocket.com.xpi!/bootstrap.js', 'path4'),
]
......
......@@ -29,7 +29,7 @@ var ContentPrefServiceParent = {
globalMM.addMessageListener("child-process-shutdown", this);
},
// Only called on Android. Listeners are added in nsBrowserGlue.js on other
// Only called on Android. Listeners are added in BrowserGlue.jsm on other
// platforms.
init() {
let globalMM = Cc["@mozilla.org/parentprocessmessagemanager;1"].getService();
......@@ -106,7 +106,7 @@ var ContentPrefServiceParent = {
}
},
// Listeners are added in nsBrowserGlue.js
// Listeners are added in BrowserGlue.jsm
receiveMessage(msg) {
if (msg.name != "ContentPrefs:FunctionCall") {
this.handleObserverChange(msg);
......
......@@ -67,7 +67,7 @@ var LoginManagerParent = {
return LoginHelper.dedupeLogins(logins, ["username"], resolveBy, formOrigin);
},
// Listeners are added in nsBrowserGlue.js on desktop
// Listeners are added in BrowserGlue.jsm on desktop
// and in BrowserCLH.js on mobile.
receiveMessage(msg) {
let data = msg.data;
......
......@@ -45,7 +45,8 @@ let HybridContentTelemetry = {
/**
* This is the handler for the async "HybridContentTelemetry:onTelemetryMessage"
* message. This function is getting called by the listener in nsBrowserGlue.js.
* message. This function is getting called by the listener in
* BrowserGlue.jsm.
*/
onTelemetryMessage(aMessage, aData) {
if (!this._hybridContentEnabled) {
......
......@@ -124,7 +124,7 @@ var HybridContentTelemetryListener = {
}
// Note that the name of the async message must match the name of
// the message in the related listener in nsBrowserGlue.js.
// the message in the related listener in BrowserGlue.jsm.
sendAsyncMessage("HybridContentTelemetry:onTelemetryMessage", {
name: event.detail.name,
data: event.detail.data,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment