Backed out changeset 6c65c331b97f (bug 1367077)

This commit is contained in:
Sebastian Hengst
2017-09-13 19:23:02 +02:00
parent 0ccaeccd1b
commit 0d1f19fcd3
3 changed files with 26 additions and 4 deletions

View File

@@ -147,14 +147,14 @@ const listeners = {
"Reader:ArticleGet": ["ReaderParent"],
"Reader:FaviconRequest": ["ReaderParent"],
"Reader:UpdateReaderButton": ["ReaderParent"],
// PLEASE KEEP THIS LIST IN SYNC WITH THE MOBILE LISTENERS IN BrowserCLH.js
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN LoginManagerParent.init
"RemoteLogins:findLogins": ["LoginManagerParent"],
"RemoteLogins:findRecipes": ["LoginManagerParent"],
"RemoteLogins:onFormSubmit": ["LoginManagerParent"],
"RemoteLogins:autoCompleteLogins": ["LoginManagerParent"],
"RemoteLogins:removeLogin": ["LoginManagerParent"],
"RemoteLogins:insecureLoginFormPresent": ["LoginManagerParent"],
// PLEASE KEEP THIS LIST IN SYNC WITH THE MOBILE LISTENERS IN BrowserCLH.js
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN LoginManagerParent.init
"WCCR:registerProtocolHandler": ["Feeds"],
"WCCR:registerContentHandler": ["Feeds"],
"rtcpeer:CancelRequest": ["webrtcUI"],

View File

@@ -66,8 +66,24 @@ var LoginManagerParent = {
return LoginHelper.dedupeLogins(logins, ["username"], resolveBy, formOrigin);
},
// Listeners are added in nsBrowserGlue.js on desktop
// and in BrowserCLH.js on mobile.
// This should only be called on Android. Listeners are added in
// nsBrowserGlue.js on desktop. Please make sure that the list of
// listeners added here stays in sync with the listeners added in
// nsBrowserGlue when you change either.
init() {
let mm = Cc["@mozilla.org/globalmessagemanager;1"]
.getService(Ci.nsIMessageListenerManager);
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN nsBrowserGlue
mm.addMessageListener("RemoteLogins:findLogins", this);
mm.addMessageListener("RemoteLogins:findRecipes", this);
mm.addMessageListener("RemoteLogins:onFormSubmit", this);
mm.addMessageListener("RemoteLogins:autoCompleteLogins", this);
mm.addMessageListener("RemoteLogins:removeLogin", this);
mm.addMessageListener("RemoteLogins:insecureLoginFormPresent", this);
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN nsBrowserGlue
},
// Listeners are added in nsBrowserGlue.js
receiveMessage(msg) {
let data = msg.data;
switch (msg.name) {

View File

@@ -398,6 +398,12 @@ if (this.addMessageListener) {
Services.obs.addObserver(onPrompt, "passwordmgr-prompt-save");
addMessageListener("setupParent", ({selfFilling = false} = {selfFilling: false}) => {
// Force LoginManagerParent to init for the tests since it's normally delayed
// by apps such as on Android.
if (AppConstants.platform == "android") {
LoginManagerParent.init();
}
commonInit(selfFilling);
sendAsyncMessage("doneSetup");
});