aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2003-07-04 00:37:44 +0800
committerXan Lopez <xan@src.gnome.org>2003-07-04 00:37:44 +0800
commit481bbe19eab224eb95d18278ee70c550773c9251 (patch)
treecd33d5d5ce0938e18564bd3da750cd253148d63f /embed
parentf5299b00454e4aba71fd4a6d6e1043fffc7b08cc (diff)
downloadgsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.tar
gsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.tar.gz
gsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.tar.bz2
gsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.tar.lz
gsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.tar.xz
gsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.tar.zst
gsoc2013-epiphany-481bbe19eab224eb95d18278ee70c550773c9251.zip
Sync with Moz Head, small cleanup.
Sync with Moz Head, small cleanup.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/ContentHandler.cpp8
-rw-r--r--embed/mozilla/ContentHandler.h1
2 files changed, 4 insertions, 5 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 6206b9d9a..4a0bbbd36 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -231,8 +231,7 @@ NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog)
GContentHandler::GContentHandler() : mUri(nsnull),
mMimeType(nsnull),
- mDownloadCanceled(PR_FALSE),
- mHelperProgress(PR_FALSE)
+ mDownloadCanceled(PR_FALSE)
{
NS_INIT_ISUPPORTS();
/* member initializers and constructor code */
@@ -333,12 +332,14 @@ NS_IMETHODIMP GContentHandler::
}
}
+#if MOZILLA_SNAPSHOT < 9
/* void showProgressDialog (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */
NS_METHOD GContentHandler::ShowProgressDialog(nsIHelperAppLauncher *aLauncher,
nsISupports *aContext)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
+#endif
////////////////////////////////////////////////////////////////////////////////
// begin local public methods impl
@@ -403,8 +404,7 @@ NS_METHOD GContentHandler::LaunchHelperApp (void)
NS_METHOD GContentHandler::ShowHelperProgressDialog (void)
{
- mHelperProgress = PR_TRUE;
- return ShowProgressDialog (mLauncher,mContext);
+ return NS_ERROR_NOT_IMPLEMENTED;
}
NS_METHOD GContentHandler::GetLauncher (nsIHelperAppLauncher * *_retval)
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index 4a6d816d7..9d3cfca2e 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -92,7 +92,6 @@ class GContentHandler : public nsIHelperAppLauncherDialog
nsCString mScheme;
PRBool mDownloadCanceled;
- PRBool mHelperProgress;
nsCOMPtr<nsIWebProgressListener> mListener;
};