Bug 1430619 part 1 - Make nsIContentViewerContainer::embed non-IDL. r=freesamael
MozReview-Commit-ID: DHHYkESWBv5
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -6851,21 +6851,17 @@ nsDocShell::RefreshURIFromQueue()
}
}
}
}
return NS_OK;
}
-//*****************************************************************************
-// nsDocShell::nsIContentViewerContainer
-//*****************************************************************************
-
-NS_IMETHODIMP
+nsresult
nsDocShell::Embed(nsIContentViewer* aContentViewer,
const char* aCommand, nsISupports* aExtraInfo)
{
// Save the LayoutHistoryState of the previous document, before
// setting up new document
PersistLayoutHistoryState();
nsresult rv = SetupNewViewer(aContentViewer);
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -864,16 +864,18 @@ private: // member functions
nsIDOMStorageManager* TopSessionStorageManager();
nsIChannel* GetCurrentDocChannel();
nsresult EnsureScriptEnvironment();
nsresult EnsureEditorData();
nsresult EnsureTransferableHookData();
nsresult EnsureFind();
nsresult EnsureCommandHandler();
nsresult RefreshURIFromQueue();
+ nsresult Embed(nsIContentViewer* aContentViewer,
+ const char* aCommand, nsISupports* aExtraInfo);
nsresult GetEldestPresContext(nsPresContext** aPresContext);
nsresult CheckLoadingPermissions();
nsresult PersistLayoutHistoryState();
nsresult LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType);
nsresult SetBaseUrlForWyciwyg(nsIContentViewer* aContentViewer);
nsresult GetRootSessionHistory(nsISHistory** aReturn);
nsresult GetHttpChannel(nsIChannel* aChannel, nsIHttpChannel** aReturn);
nsresult ConfirmRepost(bool* aRepost);
--- a/docshell/base/nsIContentViewerContainer.idl
+++ b/docshell/base/nsIContentViewerContainer.idl
@@ -5,16 +5,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsISupports.idl"
interface nsIContentViewer;
[scriptable, uuid(ea2ce7a0-5c3d-11d4-90c2-0050041caf44)]
interface nsIContentViewerContainer : nsISupports {
- void embed(in nsIContentViewer aDocViewer, in string aCommand, in nsISupports aExtraInfo);
-
/**
* Allows nsPrintJob to make this call on an internal interface to the
* DocShell.
*/
void setIsPrinting(in boolean aIsPrinting);
};