Turn on pluggable dialogs (second part of checkin, first part Bug 135441)
Bug 115136 r=dcone sr=attinasi git-svn-id: svn://10.0.0.236/trunk@120936 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -3405,4 +3405,13 @@ NS_IMETHODIMP nsBrowserWindow::EnsureWebBrowserChrome()
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult nsBrowserWindow::GetWindow(nsIWidget** aWindow)
|
||||
{
|
||||
if (aWindow && mWindow) {
|
||||
*aWindow = mWindow.get();
|
||||
NS_IF_ADDREF(*aWindow);
|
||||
return NS_OK;
|
||||
}
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
@@ -155,6 +155,7 @@ public:
|
||||
void LoadThrobberImages();
|
||||
void DestroyThrobberImages();
|
||||
virtual nsEventStatus DispatchMenuItem(PRInt32 aID) = 0;
|
||||
virtual nsresult GetWindow(nsIWidget** aWindow);
|
||||
|
||||
void DoFileOpen();
|
||||
void DoCopy();
|
||||
|
||||
@@ -323,8 +323,13 @@ NS_IMETHODIMP nsWebBrowserChrome::GetSiteWindow(void ** aParentNativeWindow)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aParentNativeWindow);
|
||||
|
||||
//XXX First Check In
|
||||
NS_ASSERTION(PR_FALSE, "Not Yet Implemented");
|
||||
if (mBrowserWindow) {
|
||||
nsCOMPtr<nsIWidget> window;
|
||||
mBrowserWindow->GetWindow(getter_AddRefs(window));
|
||||
if (window) {
|
||||
*aParentNativeWindow = window->GetNativeData(NS_NATIVE_WINDOW);
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user