Move remaining implementations in xpfe to using NS_DECL_NSIFOO.

xpfe/appshell/public/nsIDialogParamBlock.idl

@@ -40,4 +40,4 @@ interface nsIDialogParamBlock:  nsISupports
 
 %{C++
 extern nsresult NS_NewDialogParamBlockFactory(nsIFactory** aResult);
-%}
+%}

xpfe/appshell/src/nsAppShellService.cpp

@@ -98,32 +98,7 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  NS_IMETHOD Initialize(nsICmdLineService*aCmdLineService);
-  NS_IMETHOD Run();
-  NS_IMETHOD Shutdown();
-  NS_IMETHOD PushThreadEventQueue();
-  NS_IMETHOD PopThreadEventQueue();
-
-  NS_IMETHOD CreateTopLevelWindow(nsIWebShellWindow *aParent,
-                                  nsIURI *aUrl, 
-                                  PRBool aShowWindow,
-                                  PRBool aLoadDefaultPage,
-                                  PRUint32 aChromeMask,
-                                  nsIXULWindowCallbacks *aCallbacks,
-                                  PRInt32 aInitialWidth, PRInt32 aInitialHeight,
-                                  nsIWebShellWindow **aResult);
-
-  NS_IMETHOD RunModalDialog(      nsIWebShellWindow **aWindow,
-                                  nsIWebShellWindow *aParent,
-                                  nsIURI *aUrl, 
-                                  PRUint32 aChromeMask,
-                                  nsIXULWindowCallbacks *aCallbacks,
-                                  PRInt32 aInitialWidth, PRInt32 aInitialHeight);
-  NS_IMETHOD CloseTopLevelWindow(nsIWebShellWindow* aWindow);
-  NS_IMETHOD GetHiddenWindow(nsIWebShellWindow **aWindow);
-  NS_IMETHOD RegisterTopLevelWindow(nsIWebShellWindow* aWindow);
-  NS_IMETHOD UnregisterTopLevelWindow(nsIWebShellWindow* aWindow);
-
+  NS_DECL_NSIAPPSHELLSERVICE
 
 protected:
   virtual ~nsAppShellService();

xpfe/appshell/src/nsCommonDialogs.cpp

@@ -29,14 +29,8 @@ class nsCommonDialogs: public nsICommonDialogs
 public:
 			nsCommonDialogs();
   virtual	~nsCommonDialogs();
-  NS_IMETHOD Alert(nsIDOMWindow *inParent, const PRUnichar *inMsg);
-  NS_IMETHOD Confirm(nsIDOMWindow *inParent, const PRUnichar *inMsg, PRBool *_retval);
-  NS_IMETHOD ConfirmCheck(nsIDOMWindow *inParent, const PRUnichar *inMsg, const PRUnichar *inCheckMsg, PRBool *outCheckValue, PRBool *_retval);
-  NS_IMETHOD Prompt(nsIDOMWindow *inParent, const PRUnichar *inMsg, const PRUnichar *inDefaultText, PRUnichar **result, PRBool *_retval);
-  NS_IMETHOD PromptUsernameAndPassword(nsIDOMWindow *inParent, const PRUnichar *inMsg, PRUnichar **outUser, PRUnichar **outPassword, PRBool *_retval);
-  NS_IMETHOD PromptPassword(nsIDOMWindow *inParent, const PRUnichar *inMsg, PRUnichar **outPassword, PRBool *_retval);
 
-  NS_IMETHOD DoDialog(nsIDOMWindow* inParent, nsIDialogParamBlock *ioParamBlock, const char *inChromeURL);
+  NS_DECL_NSICOMMONDIALOGS
   NS_DECL_ISUPPORTS
 private:
 };

xpfe/appshell/src/nsDialogParamBlock.cpp

@@ -27,13 +27,8 @@ public:
 		nsDialogParamBlock();
 	virtual ~nsDialogParamBlock();
 	 
-	NS_IMETHOD SetNumberStrings( PRInt32 inNumStrings ); 
- 	NS_IMETHOD GetInt(PRInt32 inIndex, PRInt32 *_retval);
-	NS_IMETHOD SetInt(PRInt32 inIndex, PRInt32 inInt);
+    NS_DECL_NSIDIALOGPARAMBLOCK
 
-  
-  	NS_IMETHOD GetString(PRInt32 inIndex, PRUnichar **_retval);
-  	NS_IMETHOD SetString(PRInt32 inIndex, const PRUnichar *inString);
   	// COM
 	NS_DECL_ISUPPORTS	
 private: