From c5a67e6cb4dcc464e8ce3b64be9ea8d2331b1425 Mon Sep 17 00:00:00 2001 From: "blakeross%telocity.com" Date: Sun, 13 Oct 2002 03:31:48 +0000 Subject: [PATCH] 174132 - bookmarks shouldn't hardcode navigator chrome url (fix bookmarks notifications in Phoenix). r=bryner sr=hewitt a=brendan --- xpfe/components/bookmarks/src/nsBookmarksService.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 428f7d64016c..6fee7c3e1c6d 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -73,6 +73,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsReadableUtils.h" #include "nsUnicharUtils.h" +#include "nsICmdLineHandler.h" #include "nsISound.h" #include "nsIPrompt.h" @@ -181,7 +182,6 @@ static const char kDefaultPersonalToolbarFolder[] = "Personal Toolbar Folder static const char kBookmarkCommand[] = "http://home.netscape.com/NC-rdf#command?"; #define bookmark_properties NS_LITERAL_CSTRING("chrome://communicator/locale/bookmarks/bookmark.properties") -#define NAVIGATOR_CHROME_URL "chrome://navigator/content/" //////////////////////////////////////////////////////////////////////// @@ -2529,7 +2529,15 @@ nsBookmarksService::OnStopRequest(nsIRequest* request, nsISupports *ctxt, rv = suppString->SetData(nsDependentCString(uri)); if (NS_FAILED(rv)) return rv; suppArray->AppendElement(suppString); - wwatch->OpenWindow(0, NAVIGATOR_CHROME_URL, "_blank", "chrome,dialog=no,all", + + nsCOMPtr handler(do_GetService("@mozilla.org/commandlinehandler/general-startup;1?type=browser", &rv)); + if (NS_FAILED(rv)) return rv; + + nsXPIDLCString url; + rv = handler->GetChromeUrlForTask(getter_Copies(url)); + if (NS_FAILED(rv)) return rv; + + wwatch->OpenWindow(0, url, "_blank", "chrome,dialog=no,all", suppArray, getter_AddRefs(newWindow)); } }