Bug 1824514 - Make xpfe/appshell buildable outside of a unified build…

… environment r=andi Differential Revision: https://phabricator.services.mozilla.com/D173614
dothq · Mar 30, 2023 · dd9aff0 · dd9aff0
1 parent 9a33f06
commit dd9aff0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/xpfe/appshell/moz.build b/xpfe/appshell/moz.build
@@ -46,5 +46,3 @@ LOCAL_INCLUDES += [
 FINAL_LIBRARY = "xul"
 
 include("/ipc/chromium/chromium-config.mozbuild")
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
@@ -530,7 +530,6 @@ static bool CheckForFullscreenWindow() {
       }
     }
   }
-  return false;
 }
 #endif
 

diff --git a/xpfe/appshell/nsContentTreeOwner.cpp b/xpfe/appshell/nsContentTreeOwner.cpp
@@ -24,6 +24,7 @@
 #include "nsIMIMEInfo.h"
 #include "nsIWidget.h"
 #include "nsWindowWatcher.h"
+#include "nsIWindowMediator.h"
 #include "mozilla/Components.h"
 #include "mozilla/NullPrincipal.h"
 #include "nsDocShell.h"

diff --git a/xpfe/appshell/nsWindowMediator.cpp b/xpfe/appshell/nsWindowMediator.cpp
@@ -17,6 +17,7 @@
 #include "nsWindowMediator.h"
 #include "nsIWindowMediatorListener.h"
 #include "nsGlobalWindow.h"
+#include "nsServiceManagerUtils.h"
 
 #include "nsIDocShell.h"
 #include "nsIInterfaceRequestor.h"

diff --git a/xpfe/appshell/nsWindowMediator.h b/xpfe/appshell/nsWindowMediator.h
@@ -10,6 +10,7 @@
 #include "nsIWindowMediator.h"
 #include "nsIObserver.h"
 #include "nsTArray.h"
+#include "nsPIDOMWindow.h"
 #include "nsString.h"
 #include "nsWeakReference.h"
 #include "nsTObserverArray.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,5 +46,3 @@ LOCAL_INCLUDES += [
		FINAL_LIBRARY = "xul"

		include("/ipc/chromium/chromium-config.mozbuild")

		REQUIRES_UNIFIED_BUILD = True
-Original file line number
+Diff line change
@@ Expand Up / @@ -530,7 +530,6 @@ static bool CheckForFullscreenWindow() { @@
           }
         }
       }
-      return false;
     }
     #endif
@@ Expand Down @@