diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-10-10 23:09:26 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-10-10 23:09:26 +0000 |
| commit | 0c222d068c7ebe9315c4c54731591ce6785d1f42 (patch) | |
| tree | af760fc029cd08b6e339e5efb92453f9cafa19cc /dom/base/nsGlobalWindow.cpp | |
| parent | 0ea4019528592afbe0ae918350dd259ef6e5719a (diff) | |
| download | aura-central-0c222d068c7ebe9315c4c54731591ce6785d1f42.tar.gz | |
Issue %3010 - Remove --disable-xul config and conditionals.
Diffstat (limited to 'dom/base/nsGlobalWindow.cpp')
| -rw-r--r-- | dom/base/nsGlobalWindow.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index fa2f4ad79..2b8ace3e0 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -147,10 +147,8 @@ #include "nsIXULWindow.h" #include "nsITimedChannel.h" #include "nsServiceManagerUtils.h" -#ifdef MOZ_XUL #include "nsIDOMXULControlElement.h" #include "nsMenuPopupFrame.h" -#endif #include "mozilla/dom/CustomEvent.h" #include "nsIJARChannel.h" #include "nsIScreenManager.h" @@ -6153,12 +6151,10 @@ nsGlobalWindow::CheckSecurityWidthAndHeight(int32_t* aWidth, int32_t* aHeight, b { MOZ_ASSERT(IsOuterWindow()); -#ifdef MOZ_XUL if (!aCallerIsChrome) { // if attempting to resize the window, hide any open popups nsContentUtils::HidePopupsInDocument(mDoc); } -#endif // This one is easy. Just ensure the variable is greater than 100; if ((aWidth && *aWidth < 100) || (aHeight && *aHeight < 100)) { @@ -6222,10 +6218,8 @@ nsGlobalWindow::CheckSecurityLeftAndTop(int32_t* aLeft, int32_t* aTop, bool aCal // Check security state for use in determing window dimensions if (!aCallerIsChrome) { -#ifdef MOZ_XUL // if attempting to move the window, hide any open popups nsContentUtils::HidePopupsInDocument(mDoc); -#endif if (nsGlobalWindow* rootWindow = nsGlobalWindow::Cast(GetPrivateRoot())) { rootWindow->FlushPendingNotifications(Flush_Layout); @@ -14095,7 +14089,6 @@ nsGlobalWindow::BeginWindowMove(Event& aMouseDownEvent, Element* aPanel, nsCOMPtr<nsIWidget> widget; // if a panel was supplied, use its widget instead. -#ifdef MOZ_XUL if (aPanel) { nsIFrame* frame = aPanel->GetPrimaryFrame(); if (!frame || frame->GetType() != nsGkAtoms::menuPopupFrame) { @@ -14105,11 +14098,8 @@ nsGlobalWindow::BeginWindowMove(Event& aMouseDownEvent, Element* aPanel, widget = (static_cast<nsMenuPopupFrame*>(frame))->GetWidget(); } else { -#endif widget = GetMainWidget(); -#ifdef MOZ_XUL } -#endif if (!widget) { return; @@ -14280,7 +14270,6 @@ nsGlobalWindow::NotifyDefaultButtonLoaded(Element& aDefaultButton, ErrorResult& aError) { MOZ_ASSERT(IsInnerWindow()); -#ifdef MOZ_XUL // Don't snap to a disabled button. nsCOMPtr<nsIDOMXULControlElement> xulControl = do_QueryInterface(&aDefaultButton); @@ -14319,9 +14308,6 @@ nsGlobalWindow::NotifyDefaultButtonLoaded(Element& aDefaultButton, if (NS_FAILED(rv) && rv != NS_ERROR_NOT_IMPLEMENTED) { aError.Throw(rv); } -#else - aError.Throw(NS_ERROR_NOT_IMPLEMENTED); -#endif } NS_IMETHODIMP |