From 9cdde5595b1a16f2f2592695d6550b5fc19b6dc1 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Wed, 6 Jun 2001 06:11:28 +0000 Subject: [PATCH] Fix for 78020 - Chromeless window when opening updated bookmarked page Make bookmarks-service open a Navigator window with uri as argument using WindowWatcher interface. r=pchen, sr=blake, a=chofmann --- .../bookmarks/src/nsBookmarksService.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index bc7ea8e8075a..627350e03c7f 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -47,6 +47,7 @@ #include "nsSpecialSystemDirectory.h" #include "nsVoidArray.h" #include "nsXPIDLString.h" +#include "nsISupportsPrimitives.h" #include "prio.h" #include "prlog.h" #include "rdf.h" @@ -154,7 +155,8 @@ static const char kURINC_NewSearchFolder[] = "NC:NewSearchFolder"; // XXX static const char kDefaultPersonalToolbarFolder[] = "Personal Toolbar Folder"; static const char kBookmarkCommand[] = "http://home.netscape.com/NC-rdf#command?"; -#define bookmark_properties "chrome://communicator/locale/bookmarks/bookmark.properties" +#define bookmark_properties "chrome://communicator/locale/bookmarks/bookmark.properties" +#define NAVIGATOR_CHROME_URL "chrome://navigator/content/" //////////////////////////////////////////////////////////////////////// @@ -2390,7 +2392,16 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt, if (wwatch) { nsCOMPtr newWindow; - wwatch->OpenWindow(0, uri, "_blank", 0, 0, getter_AddRefs(newWindow)); + nsCOMPtr suppArray; + rv = NS_NewISupportsArray(getter_AddRefs(suppArray)); + if (NS_FAILED(rv)) return rv; + nsCOMPtr suppString(do_CreateInstance("@mozilla.org/supports-string;1", &rv)); + if (!suppString) return rv; + rv = suppString->SetData(uri); + if (NS_FAILED(rv)) return rv; + suppArray->AppendElement(suppString); + wwatch->OpenWindow(0, NAVIGATOR_CHROME_URL, "_blank", "chrome,dialog=no,all", + suppArray, getter_AddRefs(newWindow)); } } }