Bug 659576 - bool nsGlobalWindow::ConfirmDialogAllowed() returns nsresult; r=jst
authorJames Hobin <hobinjk@gmail.com>
Wed, 14 Sep 2011 16:34:25 +0100
changeset 76966 4f315828a0aa6dcbf375488e47b991fabbdc1278
parent 76965 307b5fa030fd8618c9723c1979a1e02a5a58fe34
child 76967 70411e3adb66156548a7d8d9e75e71941d852faf
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersjst
bugs659576
milestone9.0a1
Bug 659576 - bool nsGlobalWindow::ConfirmDialogAllowed() returns nsresult; r=jst
dom/base/nsGlobalWindow.cpp
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -2670,17 +2670,17 @@ nsGlobalWindow::AreDialogsBlocked()
          (topWindow->mDialogDisabled &&
           (topWindow->GetPopupControlState() > openAllowed ||
            topWindow->mDialogAbuseCount >= MAX_DIALOG_COUNT));
 }
 
 bool
 nsGlobalWindow::ConfirmDialogAllowed()
 {
-  FORWARD_TO_OUTER(ConfirmDialogAllowed, (), NS_ERROR_NOT_INITIALIZED);
+  FORWARD_TO_OUTER(ConfirmDialogAllowed, (), false);
 
   NS_ENSURE_TRUE(mDocShell, false);
   nsCOMPtr<nsIPromptService> promptSvc =
     do_GetService("@mozilla.org/embedcomp/prompt-service;1");
 
   if (!DialogOpenAttempted() || !promptSvc) {
     return true;
   }