Commit 4605c4cc authored by Tatiana Meshkova's avatar Tatiana Meshkova

Fixed compilation for desktop target

parent 2d63c5f6
...@@ -24,13 +24,14 @@ class EmbedChromeListener : public nsIDOMEventListener ...@@ -24,13 +24,14 @@ class EmbedChromeListener : public nsIDOMEventListener
{ {
public: public:
EmbedChromeListener(nsIDOMWindow* aWin); EmbedChromeListener(nsIDOMWindow* aWin);
virtual ~EmbedChromeListener();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIDOMEVENTLISTENER NS_DECL_NSIDOMEVENTLISTENER
nsCOMPtr<nsIDOMWindow> DOMWindow; nsCOMPtr<nsIDOMWindow> DOMWindow;
private: private:
virtual ~EmbedChromeListener();
nsCOMPtr<nsIEmbedAppService> mService; nsCOMPtr<nsIEmbedAppService> mService;
int mWindowCounter; int mWindowCounter;
}; };
......
...@@ -19,13 +19,14 @@ class EmbedChromeManager : public nsIObserver, ...@@ -19,13 +19,14 @@ class EmbedChromeManager : public nsIObserver,
{ {
public: public:
EmbedChromeManager(); EmbedChromeManager();
virtual ~EmbedChromeManager();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER
nsresult Init(); nsresult Init();
private: private:
virtual ~EmbedChromeManager();
void WindowCreated(nsIDOMWindow* aWin); void WindowCreated(nsIDOMWindow* aWin);
void WindowDestroyed(nsIDOMWindow* aWin); void WindowDestroyed(nsIDOMWindow* aWin);
nsCOMPtr<nsIEmbedAppService> mService; nsCOMPtr<nsIEmbedAppService> mService;
......
...@@ -42,6 +42,7 @@ public: ...@@ -42,6 +42,7 @@ public:
EmbedHistoryListener(); EmbedHistoryListener();
private: private:
virtual ~EmbedHistoryListener() {}
nsIEmbedAppService* GetService(); nsIEmbedAppService* GetService();
static EmbedHistoryListener* sHistory; static EmbedHistoryListener* sHistory;
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include "EmbedPromptService.h" #include "EmbedPromptService.h"
#include "nsIComponentRegistrar.h" #include "nsIComponentRegistrar.h"
#include "nsIComponentManager.h" #include "nsIComponentManager.h"
#include "GenericFactory.h"
#include "mozilla/ModuleUtils.h" #include "mozilla/ModuleUtils.h"
#include "../widgetfactory/EmbedliteGenericFactory.h"
#include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h"
#include "nsILoginManager.h" #include "nsILoginManager.h"
...@@ -46,7 +46,7 @@ EmbedPromptRegister::Init() ...@@ -46,7 +46,7 @@ EmbedPromptRegister::Init()
rv = NS_GetComponentManager (getter_AddRefs (cm)); rv = NS_GetComponentManager (getter_AddRefs (cm));
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
nsCOMPtr<nsIFactory> f = new mozilla::embedlite::GenericFactory(EmbedPromptFactoryConstructor); nsCOMPtr<nsIFactory> f = new mozilla::embedlite::EmbedliteGenericFactory(EmbedPromptFactoryConstructor);
if (!f) { if (!f) {
NS_WARNING("Unable to create factory for component"); NS_WARNING("Unable to create factory for component");
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
...@@ -69,7 +69,7 @@ EmbedPromptRegister::Init() ...@@ -69,7 +69,7 @@ EmbedPromptRegister::Init()
rv = cr->RegisterFactory(promptCID, "EmbedLite Prompt", rv = cr->RegisterFactory(promptCID, "EmbedLite Prompt",
"@mozilla.org/prompter;1", f); "@mozilla.org/prompter;1", f);
f = new mozilla::embedlite::GenericFactory(nsEmbedAlertsServiceConstructor); f = new mozilla::embedlite::EmbedliteGenericFactory(nsEmbedAlertsServiceConstructor);
if (!f) { if (!f) {
NS_WARNING("Unable to create factory for component"); NS_WARNING("Unable to create factory for component");
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
......
...@@ -15,12 +15,14 @@ class EmbedPromptRegister : public nsIObserver, ...@@ -15,12 +15,14 @@ class EmbedPromptRegister : public nsIObserver,
{ {
public: public:
EmbedPromptRegister(); EmbedPromptRegister();
virtual ~EmbedPromptRegister();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER
nsresult Init(); nsresult Init();
private:
virtual ~EmbedPromptRegister();
}; };
#define NS_EMBED_PROMPT_CONTRACTID "@mozilla.org/embed-prompt-component;1" #define NS_EMBED_PROMPT_CONTRACTID "@mozilla.org/embed-prompt-component;1"
......
...@@ -559,10 +559,6 @@ public: ...@@ -559,10 +559,6 @@ public:
NS_ASSERTION(mCallback, "null callback"); NS_ASSERTION(mCallback, "null callback");
} }
~nsAuthCancelableConsumer()
{
}
NS_IMETHOD Cancel(nsresult reason) NS_IMETHOD Cancel(nsresult reason)
{ {
NS_ENSURE_ARG(NS_FAILED(reason)); NS_ENSURE_ARG(NS_FAILED(reason));
...@@ -578,6 +574,8 @@ public: ...@@ -578,6 +574,8 @@ public:
nsCOMPtr<nsIAuthPromptCallback> mCallback; nsCOMPtr<nsIAuthPromptCallback> mCallback;
nsCOMPtr<nsISupports> mContext; nsCOMPtr<nsISupports> mContext;
private:
virtual ~nsAuthCancelableConsumer() {}
}; };
NS_IMPL_ISUPPORTS(nsAuthCancelableConsumer, nsICancelable); NS_IMPL_ISUPPORTS(nsAuthCancelableConsumer, nsICancelable);
...@@ -643,11 +641,10 @@ public: ...@@ -643,11 +641,10 @@ public:
: mPrompt(aPrompt) : mPrompt(aPrompt)
{ {
} }
virtual ~EmbedAuthRunnable()
{
}
NS_IMETHOD Run(); NS_IMETHOD Run();
EmbedAsyncAuthPrompt* mPrompt; EmbedAsyncAuthPrompt* mPrompt;
private:
virtual ~EmbedAuthRunnable() {}
}; };
NS_IMPL_ISUPPORTS(EmbedAuthRunnable, nsIRunnable) NS_IMPL_ISUPPORTS(EmbedAuthRunnable, nsIRunnable)
......
...@@ -56,12 +56,12 @@ class EmbedPromptOuterObserver : public nsIObserver, public nsSupportsWeakRefere ...@@ -56,12 +56,12 @@ class EmbedPromptOuterObserver : public nsIObserver, public nsSupportsWeakRefere
{ {
public: public:
EmbedPromptOuterObserver(IDestroyNotification* aNotifier, nsIDOMWindow* aWin); EmbedPromptOuterObserver(IDestroyNotification* aNotifier, nsIDOMWindow* aWin);
virtual ~EmbedPromptOuterObserver();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER
void OnDestroy(); void OnDestroy();
private: private:
virtual ~EmbedPromptOuterObserver();
IDestroyNotification* mNotifier; IDestroyNotification* mNotifier;
nsCOMPtr<nsIDOMWindow> mWin; nsCOMPtr<nsIDOMWindow> mWin;
nsCOMPtr<nsIObserverService> mService; nsCOMPtr<nsIObserverService> mService;
...@@ -71,7 +71,6 @@ class EmbedPromptService : public nsIPrompt, public nsIEmbedMessageListener, pub ...@@ -71,7 +71,6 @@ class EmbedPromptService : public nsIPrompt, public nsIEmbedMessageListener, pub
{ {
public: public:
EmbedPromptService(nsIDOMWindow* aWin); EmbedPromptService(nsIDOMWindow* aWin);
virtual ~EmbedPromptService();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIPROMPT NS_DECL_NSIPROMPT
...@@ -80,6 +79,7 @@ public: ...@@ -80,6 +79,7 @@ public:
virtual void OnDestroyNotification(); virtual void OnDestroyNotification();
private: private:
virtual ~EmbedPromptService();
void CancelResponse(); void CancelResponse();
uint32_t CheckWinID(); uint32_t CheckWinID();
...@@ -106,7 +106,6 @@ public: ...@@ -106,7 +106,6 @@ public:
consumers.AppendElement(aCancelable); consumers.AppendElement(aCancelable);
} }
virtual ~EmbedAsyncAuthPrompt() {}
nsTArray<nsRefPtr<nsICancelable>> consumers; nsTArray<nsRefPtr<nsICancelable>> consumers;
nsIDOMWindow* mWin; nsIDOMWindow* mWin;
nsCOMPtr<nsIChannel> mChannel; nsCOMPtr<nsIChannel> mChannel;
...@@ -115,13 +114,13 @@ public: ...@@ -115,13 +114,13 @@ public:
bool mInProgress; bool mInProgress;
nsCString mHashKey; nsCString mHashKey;
RefPtr<EmbedAuthPromptService> mService; RefPtr<EmbedAuthPromptService> mService;
virtual ~EmbedAsyncAuthPrompt() {}
}; };
class EmbedAuthPromptService : public nsIAuthPrompt2, public nsIEmbedMessageListener, public IDestroyNotification class EmbedAuthPromptService : public nsIAuthPrompt2, public nsIEmbedMessageListener, public IDestroyNotification
{ {
public: public:
EmbedAuthPromptService(nsIDOMWindow* aWin); EmbedAuthPromptService(nsIDOMWindow* aWin);
virtual ~EmbedAuthPromptService();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIAUTHPROMPT2 NS_DECL_NSIAUTHPROMPT2
...@@ -136,6 +135,7 @@ public: ...@@ -136,6 +135,7 @@ public:
virtual void OnDestroyNotification(); virtual void OnDestroyNotification();
private: private:
virtual ~EmbedAuthPromptService();
void DoAsyncPrompt(); void DoAsyncPrompt();
void CancelResponse(); void CancelResponse();
uint32_t CheckWinID(); uint32_t CheckWinID();
...@@ -149,14 +149,15 @@ private: ...@@ -149,14 +149,15 @@ private:
RefPtr<EmbedPromptOuterObserver> mOuterService; RefPtr<EmbedPromptOuterObserver> mOuterService;
}; };
class EmbedPromptFactory : public nsIPromptFactory class EmbedPromptFactory : public nsIPromptFactory
{ {
public: public:
EmbedPromptFactory(); EmbedPromptFactory();
virtual ~EmbedPromptFactory();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIPROMPTFACTORY NS_DECL_NSIPROMPTFACTORY
private:
virtual ~EmbedPromptFactory();
}; };
}} }}
......
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "GenericFactory.h"
namespace mozilla {
namespace embedlite {
NS_IMPL_ISUPPORTS(GenericFactory, nsIFactory)
NS_IMETHODIMP
GenericFactory::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
void** aResult)
{
return mCtor(aOuter, aIID, aResult);
}
NS_IMETHODIMP
GenericFactory::LockFactory(bool aLock)
{
NS_ERROR("Vestigial method, never called!");
return NS_ERROR_FAILURE;
}
} // namespace mozilla
} // namespace mozilla
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_GenericFactory_h
#define mozilla_GenericFactory_h
#include "mozilla/Attributes.h"
#include "mozilla/Module.h"
namespace mozilla {
namespace embedlite {
/**
* A generic factory which uses a constructor function to create instances.
* This class is intended for use by the component manager and the generic
* module.
*/
class GenericFactory MOZ_FINAL : public nsIFactory
{
public:
typedef Module::ConstructorProcPtr ConstructorProcPtr;
NS_DECL_ISUPPORTS
NS_DECL_NSIFACTORY
GenericFactory(ConstructorProcPtr ctor)
: mCtor(ctor)
{
NS_ASSERTION(mCtor, "GenericFactory with no constructor");
}
private:
ConstructorProcPtr mCtor;
};
} // namespace mozilla
} // namespace mozilla
#endif // mozilla_GenericFactory_h
...@@ -4,8 +4,8 @@ libbz_LTLIBRARIES = libprompt.la ...@@ -4,8 +4,8 @@ libbz_LTLIBRARIES = libprompt.la
libprompt_la_SOURCES = \ libprompt_la_SOURCES = \
EmbedPromptRegister.cpp \ EmbedPromptRegister.cpp \
EmbedPromptService.cpp \ EmbedPromptService.cpp \
GenericFactory.cpp \
nsEmbedChildModule.cpp \ nsEmbedChildModule.cpp \
../widgetfactory/EmbedliteGenericFactory.cpp \
nsAlertsService.cpp \ nsAlertsService.cpp \
$(NULL) $(NULL)
......
...@@ -18,9 +18,9 @@ public: ...@@ -18,9 +18,9 @@ public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
nsEmbedAlertsService(); nsEmbedAlertsService();
virtual ~nsEmbedAlertsService();
protected: protected:
virtual ~nsEmbedAlertsService();
bool ShouldShowAlert(); bool ShouldShowAlert();
}; };
......
...@@ -27,8 +27,6 @@ class EmbedTouchListener : public nsIDOMEventListener, ...@@ -27,8 +27,6 @@ class EmbedTouchListener : public nsIDOMEventListener,
{ {
public: public:
EmbedTouchListener(nsIDOMWindow* aWin); EmbedTouchListener(nsIDOMWindow* aWin);
virtual ~EmbedTouchListener();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIDOMEVENTLISTENER NS_DECL_NSIDOMEVENTLISTENER
...@@ -44,6 +42,8 @@ public: ...@@ -44,6 +42,8 @@ public:
nsCOMPtr<nsIDOMWindow> DOMWindow; nsCOMPtr<nsIDOMWindow> DOMWindow;
private: private:
virtual ~EmbedTouchListener();
void AnyElementFromPoint(nsIDOMWindow* aWindow, double aX, double aY, nsIDOMElement* *aElem); void AnyElementFromPoint(nsIDOMWindow* aWindow, double aX, double aY, nsIDOMElement* *aElem);
bool ShouldZoomToElement(nsIDOMElement* aElement); bool ShouldZoomToElement(nsIDOMElement* aElement);
void ZoomToElement(nsIDOMElement* aElement, void ZoomToElement(nsIDOMElement* aElement,
......
...@@ -19,13 +19,13 @@ class EmbedTouchManager : public nsIObserver, ...@@ -19,13 +19,13 @@ class EmbedTouchManager : public nsIObserver,
{ {
public: public:
EmbedTouchManager(); EmbedTouchManager();
virtual ~EmbedTouchManager();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER
nsresult Init(); nsresult Init();
private: private:
virtual ~EmbedTouchManager();
void WindowCreated(nsIDOMWindow* aWin); void WindowCreated(nsIDOMWindow* aWin);
void WindowDestroyed(nsIDOMWindow* aWin); void WindowDestroyed(nsIDOMWindow* aWin);
nsCOMPtr<nsIEmbedAppService> mService; nsCOMPtr<nsIEmbedAppService> mService;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "nsIObserverService.h" #include "nsIObserverService.h"
#include "nsIComponentRegistrar.h" #include "nsIComponentRegistrar.h"
#include "nsIComponentManager.h" #include "nsIComponentManager.h"
#include "GenericFactory.h" #include "EmbedliteGenericFactory.h"
#include "mozilla/ModuleUtils.h" #include "mozilla/ModuleUtils.h"
#include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h"
...@@ -49,7 +49,7 @@ EmbedWidgetFactoryRegister::Init() ...@@ -49,7 +49,7 @@ EmbedWidgetFactoryRegister::Init()
rv = NS_GetComponentManager (getter_AddRefs (cm)); rv = NS_GetComponentManager (getter_AddRefs (cm));
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
nsCOMPtr<nsIFactory> fp = new mozilla::embedlite::GenericFactory(nsEmbedFilePickerConstructor); nsCOMPtr<nsIFactory> fp = new mozilla::embedlite::EmbedliteGenericFactory(nsEmbedFilePickerConstructor);
if (!fp) { if (!fp) {
NS_WARNING("Unable to create factory for component"); NS_WARNING("Unable to create factory for component");
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
...@@ -71,7 +71,7 @@ EmbedWidgetFactoryRegister::Init() ...@@ -71,7 +71,7 @@ EmbedWidgetFactoryRegister::Init()
rv = cr->RegisterFactory(fpickerCID, "EmbedLite FilePicker", rv = cr->RegisterFactory(fpickerCID, "EmbedLite FilePicker",
filepickerCONTRACTID, fp); filepickerCONTRACTID, fp);
fp = new mozilla::embedlite::GenericFactory(nsEmbedClipboardConstructor); fp = new mozilla::embedlite::EmbedliteGenericFactory(nsEmbedClipboardConstructor);
if (!fp) { if (!fp) {
NS_WARNING("Unable to create factory for component"); NS_WARNING("Unable to create factory for component");
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
......
...@@ -13,11 +13,11 @@ class EmbedWidgetFactoryRegister : public nsSupportsWeakReference ...@@ -13,11 +13,11 @@ class EmbedWidgetFactoryRegister : public nsSupportsWeakReference
{ {
public: public:
EmbedWidgetFactoryRegister(); EmbedWidgetFactoryRegister();
virtual ~EmbedWidgetFactoryRegister();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
nsresult Init(); nsresult Init();
private:
virtual ~EmbedWidgetFactoryRegister();
}; };
#define NS_EMBED_WIDGETFACTORY_CONTRACTID "@mozilla.org/embed-widget-factory-component;1" #define NS_EMBED_WIDGETFACTORY_CONTRACTID "@mozilla.org/embed-widget-factory-component;1"
......
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "GenericFactory.h"
namespace mozilla {
namespace embedlite {
NS_IMPL_ISUPPORTS(GenericFactory, nsIFactory)
NS_IMETHODIMP
GenericFactory::CreateInstance(nsISupports* aOuter, REFNSIID aIID,
void** aResult)
{
return mCtor(aOuter, aIID, aResult);
}
NS_IMETHODIMP
GenericFactory::LockFactory(bool aLock)
{
NS_ERROR("Vestigial method, never called!");
return NS_ERROR_FAILURE;
}
} // namespace mozilla
} // namespace mozilla
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_GenericFactory_h
#define mozilla_GenericFactory_h
#include "mozilla/Attributes.h"
#include "mozilla/Module.h"
namespace mozilla {
namespace embedlite {
/**
* A generic factory which uses a constructor function to create instances.
* This class is intended for use by the component manager and the generic
* module.
*/
class GenericFactory MOZ_FINAL : public nsIFactory
{
public:
typedef Module::ConstructorProcPtr ConstructorProcPtr;
NS_DECL_ISUPPORTS
NS_DECL_NSIFACTORY
GenericFactory(ConstructorProcPtr ctor)
: mCtor(ctor)
{
NS_ASSERTION(mCtor, "GenericFactory with no constructor");
}
private:
ConstructorProcPtr mCtor;
};
} // namespace mozilla
} // namespace mozilla
#endif // mozilla_GenericFactory_h
...@@ -4,7 +4,7 @@ libbz_LTLIBRARIES = libwidgetfactory.la ...@@ -4,7 +4,7 @@ libbz_LTLIBRARIES = libwidgetfactory.la
libwidgetfactory_la_SOURCES = \ libwidgetfactory_la_SOURCES = \
EmbedWidgetFactoryRegister.cpp \ EmbedWidgetFactoryRegister.cpp \
nsFilePicker.cpp \ nsFilePicker.cpp \
GenericFactory.cpp \ EmbedliteGenericFactory.cpp \
nsEmbedChildModule.cpp \ nsEmbedChildModule.cpp \
nsClipboard.cpp \ nsClipboard.cpp \
$(NULL) $(NULL)
......
...@@ -19,8 +19,6 @@ class nsEmbedClipboard : public nsIClipboard, public nsIObserver ...@@ -19,8 +19,6 @@ class nsEmbedClipboard : public nsIClipboard, public nsIObserver
{ {
public: public:
nsEmbedClipboard(); nsEmbedClipboard();
virtual ~nsEmbedClipboard();
//nsISupports //nsISupports
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER
...@@ -29,6 +27,8 @@ public: ...@@ -29,6 +27,8 @@ public:
NS_DECL_NSICLIPBOARD NS_DECL_NSICLIPBOARD
private: private:
virtual ~nsEmbedClipboard();
nsCOMPtr<nsIEmbedAppService> mService; nsCOMPtr<nsIEmbedAppService> mService;
nsCOMPtr<nsIObserverService> mObserverService; nsCOMPtr<nsIObserverService> mObserverService;
nsString mBuffer; nsString mBuffer;
......
...@@ -358,8 +358,6 @@ public: ...@@ -358,8 +358,6 @@ public:
utils = do_GetInterface(aWin); utils = do_GetInterface(aWin);
} }
virtual ~nsBaseFilePickerEnumerator()
{}
NS_IMETHOD NS_IMETHOD
GetNext(nsISupports** aResult) GetNext(nsISupports** aResult)
...@@ -390,6 +388,8 @@ public: ...@@ -390,6 +388,8 @@ public:
} }
private: private:
virtual ~nsBaseFilePickerEnumerator() {}
nsCOMPtr<nsISimpleEnumerator> mIterator; nsCOMPtr<nsISimpleEnumerator> mIterator;
nsCOMPtr<nsIDOMWindowUtils> utils; nsCOMPtr<nsIDOMWindowUtils> utils;
}; };
......
...@@ -32,13 +32,13 @@ class nsEmbedFilePicker : public nsIFilePicker, public nsIEmbedMessageListener ...@@ -32,13 +32,13 @@ class nsEmbedFilePicker : public nsIFilePicker, public nsIEmbedMessageListener
{ {
public: public:
nsEmbedFilePicker(); nsEmbedFilePicker();
virtual ~nsEmbedFilePicker();
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSIFILEPICKER NS_DECL_NSIFILEPICKER
NS_DECL_NSIEMBEDMESSAGELISTENER NS_DECL_NSIEMBEDMESSAGELISTENER
private: private:
virtual ~nsEmbedFilePicker();
nsresult DoSendPrompt(); nsresult DoSendPrompt();
EmbedFilePickerResponse GetResponse(); EmbedFilePickerResponse GetResponse();
int mModalDepth; int mModalDepth;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment