aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/ContentHandler.cpp15
-rw-r--r--embed/mozilla/ContentHandler.h1
2 files changed, 10 insertions, 6 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index d06d3dbdd..332456b71 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -246,10 +246,20 @@ GContentHandler::~GContentHandler()
// begin nsIHelperAppLauncher impl
////////////////////////////////////////////////////////////////////////////////
+#if MOZILLA_SNAPSHOT > 8
/* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */
NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
+ nsISupports *aContext,
+ PRBool aForced)
+#else
+NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
nsISupports *aContext)
+#endif
{
+ /* aForced reflects if the content being sent is normally viewable
+ * in mozilla or not. That fact doesn't affect us, so ignore it
+ */
+
nsresult rv;
mLauncher = aLauncher;
@@ -400,11 +410,6 @@ NS_METHOD GContentHandler::LaunchHelperApp (void)
return NS_OK;
}
-NS_METHOD GContentHandler::ShowHelperProgressDialog (void)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
-
NS_METHOD GContentHandler::GetLauncher (nsIHelperAppLauncher * *_retval)
{
NS_IF_ADDREF (*_retval = mLauncher);
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index 9d3cfca2e..d08cf6cbd 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -63,7 +63,6 @@ class GContentHandler : public nsIHelperAppLauncherDialog
NS_METHOD FindHelperApp (void);
NS_METHOD LaunchHelperApp (void);
- NS_METHOD ShowHelperProgressDialog (void);
NS_METHOD GetLauncher (nsIHelperAppLauncher * *_retval);
NS_METHOD GetContext (nsISupports * *_retval);