diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index bc32212274ed..c6657d0f4930 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -154,7 +154,6 @@ let LEGACY_ACTORS = {
"AboutLogins:LoginModified",
"AboutLogins:LoginRemoved",
"AboutLogins:MasterPasswordResponse",
- "AboutLogins:SendFavicons",
"AboutLogins:SyncState",
"AboutLogins:UpdateBreaches",
],
diff --git a/browser/components/aboutlogins/AboutLoginsChild.jsm b/browser/components/aboutlogins/AboutLoginsChild.jsm
index 8286d2b0b8dc..3dc54c6d42bd 100644
--- a/browser/components/aboutlogins/AboutLoginsChild.jsm
+++ b/browser/components/aboutlogins/AboutLoginsChild.jsm
@@ -167,9 +167,6 @@ class AboutLoginsChild extends ActorChild {
if (masterPasswordPromise) {
masterPasswordPromise.resolve(message.data);
}
- case "AboutLogins:SendFavicons":
- this.sendToContent("SendFavicons", message.data);
- break;
case "AboutLogins:SyncState":
this.sendToContent("SyncState", message.data);
break;
diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 0a6025c834c5..4e5cd087a655 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -35,12 +35,6 @@ ChromeUtils.defineModuleGetter(
"resource://services-sync/UIState.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "PlacesUtils",
- "resource://gre/modules/PlacesUtils.jsm"
-);
-
XPCOMUtils.defineLazyGetter(this, "log", () => {
return LoginHelper.createLogger("AboutLoginsParent");
});
@@ -267,19 +261,16 @@ var AboutLoginsParent = {
messageManager.sendAsyncMessage("AboutLogins:SyncState", syncState);
this.updatePasswordSyncNotificationState();
- if (BREACH_ALERTS_ENABLED) {
- const breachesByLoginGUID = await LoginHelper.getBreachesForLogins(
- logins
- );
- messageManager.sendAsyncMessage(
- "AboutLogins:UpdateBreaches",
- breachesByLoginGUID
- );
+ if (!BREACH_ALERTS_ENABLED) {
+ return;
}
+ const breachesByLoginGUID = await LoginHelper.getBreachesForLogins(
+ logins
+ );
messageManager.sendAsyncMessage(
- "AboutLogins:SendFavicons",
- await this.getAllFavicons(logins)
+ "AboutLogins:UpdateBreaches",
+ breachesByLoginGUID
);
} catch (ex) {
if (ex.result != Cr.NS_ERROR_NOT_INITIALIZED) {
@@ -382,38 +373,6 @@ var AboutLoginsParent = {
}
},
- async getFavicon(login) {
- try {
- const faviconData = await PlacesUtils.promiseFaviconData(login.hostname);
- return {
- faviconData,
- title: login.title,
- };
- } catch (ex) {
- return null;
- }
- },
-
- async getAllFavicons(logins) {
- let favicons = await Promise.all(
- logins.map(login => this.getFavicon(login))
- );
- let vanillaFavicons = {};
- for (let favicon of favicons) {
- if (!favicon) {
- continue;
- }
- try {
- vanillaFavicons[favicon.title] = {
- data: favicon.faviconData.data,
- dataLen: favicon.faviconData.dataLen,
- mimeType: favicon.faviconData.mimeType,
- };
- } catch (ex) {}
- }
- return vanillaFavicons;
- },
-
showMasterPasswordLoginNotifications() {
this.showNotifications({
id: MASTER_PASSWORD_NOTIFICATION_ID,
diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
index aaf1e1b55b59..e45dbe24777e 100644
--- a/browser/components/aboutlogins/content/aboutLogins.html
+++ b/browser/components/aboutlogins/content/aboutLogins.html
@@ -90,11 +90,8 @@