# HG changeset patch # User Frank-Rainer Grahl # Date 1728593214 -7200 # Parent 1aea0bb1f37deeef853d7307272702b70a083e32 Bug 1925033 - Use Services.focus for bookmarking from mailnews. r=IanN a=IanN diff --git a/suite/components/places/PlacesUIUtils.jsm b/suite/components/places/PlacesUIUtils.jsm --- a/suite/components/places/PlacesUIUtils.jsm +++ b/suite/components/places/PlacesUIUtils.jsm @@ -1452,17 +1452,17 @@ var PlacesUIUtils = { info.postData = aPostData; if (typeof(aCharSet) == "string") info.charSet = aCharSet; } else info.hiddenRows.push("keyword"); return this.showBookmarkDialog(info, - focusManager.activeWindow || + Services.focus.activeWindow || Services.wm.getMostRecentWindow(null)); }, /** * Helpers for consumers of editBookmarkOverlay which don't have a node as their input. * * Given a bookmark object for either a url bookmark or a folder, returned by * Bookmarks.fetch (see Bookmark.jsm), this creates a node-like object suitable for @@ -1571,12 +1571,8 @@ PlacesUIUtils.URI_FLAVORS = [PlacesUtils PlacesUIUtils.SUPPORTED_FLAVORS = [...PlacesUIUtils.PLACES_FLAVORS, ...PlacesUIUtils.URI_FLAVORS]; XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ellipsis", function() { return Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data; }); - -XPCOMUtils.defineLazyServiceGetter(this, "focusManager", - "@mozilla.org/focus-manager;1", - "nsIFocusManager");