Bug 1047873 - Flatten xpfe/appshell/{public,src}/ directories. r=Neil

ambroff · Aug 2, 2014 · 212ab95 · 212ab95
1 parent 0827bb1
commit 212ab95
Show file tree

Hide file tree

Showing 27 changed files with 35 additions and 49 deletions.
diff --git a/xpfe/appshell/moz.build b/xpfe/appshell/moz.build
@@ -4,5 +4,39 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
+XPIDL_SOURCES += [
+    'nsIAppShellService.idl',
+    'nsIPopupWindowManager.idl',
+    'nsIWindowMediator.idl',
+    'nsIWindowMediatorListener.idl',
+    'nsIXULBrowserWindow.idl',
+    'nsIXULWindow.idl',
+]
+
+XPIDL_MODULE = 'appshell'
+
+EXPORTS += [
+    'nsAppShellCID.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsAppShellFactory.cpp',
+    'nsAppShellService.cpp',
+    'nsAppShellWindowEnumerator.cpp',
+    'nsChromeTreeOwner.cpp',
+    'nsContentTreeOwner.cpp',
+    'nsWebShellWindow.cpp',
+    'nsWindowMediator.cpp',
+    'nsXULWindow.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
+FAIL_ON_WARNINGS = True
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
diff --git a/xpfe/appshell/public/nsAppShellCID.h → xpfe/appshell/nsAppShellCID.h b/xpfe/appshell/public/nsAppShellCID.h → xpfe/appshell/nsAppShellCID.h
diff --git a/xpfe/appshell/src/nsAppShellFactory.cpp → xpfe/appshell/nsAppShellFactory.cpp b/xpfe/appshell/src/nsAppShellFactory.cpp → xpfe/appshell/nsAppShellFactory.cpp
diff --git a/xpfe/appshell/src/nsAppShellService.cpp → xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp → xpfe/appshell/nsAppShellService.cpp
diff --git a/xpfe/appshell/src/nsAppShellService.h → xpfe/appshell/nsAppShellService.h b/xpfe/appshell/src/nsAppShellService.h → xpfe/appshell/nsAppShellService.h
diff --git a/...pshell/src/nsAppShellWindowEnumerator.cpp → xpfe/appshell/nsAppShellWindowEnumerator.cpp b/...pshell/src/nsAppShellWindowEnumerator.cpp → xpfe/appshell/nsAppShellWindowEnumerator.cpp
diff --git a/...appshell/src/nsAppShellWindowEnumerator.h → xpfe/appshell/nsAppShellWindowEnumerator.h b/...appshell/src/nsAppShellWindowEnumerator.h → xpfe/appshell/nsAppShellWindowEnumerator.h
diff --git a/xpfe/appshell/src/nsChromeTreeOwner.cpp → xpfe/appshell/nsChromeTreeOwner.cpp b/xpfe/appshell/src/nsChromeTreeOwner.cpp → xpfe/appshell/nsChromeTreeOwner.cpp
diff --git a/xpfe/appshell/src/nsChromeTreeOwner.h → xpfe/appshell/nsChromeTreeOwner.h b/xpfe/appshell/src/nsChromeTreeOwner.h → xpfe/appshell/nsChromeTreeOwner.h
diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp → xpfe/appshell/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp → xpfe/appshell/nsContentTreeOwner.cpp
diff --git a/xpfe/appshell/src/nsContentTreeOwner.h → xpfe/appshell/nsContentTreeOwner.h b/xpfe/appshell/src/nsContentTreeOwner.h → xpfe/appshell/nsContentTreeOwner.h
diff --git a/xpfe/appshell/public/nsIAppShellService.idl → xpfe/appshell/nsIAppShellService.idl b/xpfe/appshell/public/nsIAppShellService.idl → xpfe/appshell/nsIAppShellService.idl
diff --git a/...appshell/public/nsIPopupWindowManager.idl → xpfe/appshell/nsIPopupWindowManager.idl b/...appshell/public/nsIPopupWindowManager.idl → xpfe/appshell/nsIPopupWindowManager.idl
diff --git a/xpfe/appshell/public/nsIWindowMediator.idl → xpfe/appshell/nsIWindowMediator.idl b/xpfe/appshell/public/nsIWindowMediator.idl → xpfe/appshell/nsIWindowMediator.idl
diff --git a/...hell/public/nsIWindowMediatorListener.idl → xpfe/appshell/nsIWindowMediatorListener.idl b/...hell/public/nsIWindowMediatorListener.idl → xpfe/appshell/nsIWindowMediatorListener.idl
diff --git a/xpfe/appshell/public/nsIXULBrowserWindow.idl → xpfe/appshell/nsIXULBrowserWindow.idl b/xpfe/appshell/public/nsIXULBrowserWindow.idl → xpfe/appshell/nsIXULBrowserWindow.idl
diff --git a/xpfe/appshell/public/nsIXULWindow.idl → xpfe/appshell/nsIXULWindow.idl b/xpfe/appshell/public/nsIXULWindow.idl → xpfe/appshell/nsIXULWindow.idl
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp → xpfe/appshell/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp → xpfe/appshell/nsWebShellWindow.cpp
diff --git a/xpfe/appshell/src/nsWebShellWindow.h → xpfe/appshell/nsWebShellWindow.h b/xpfe/appshell/src/nsWebShellWindow.h → xpfe/appshell/nsWebShellWindow.h
diff --git a/xpfe/appshell/src/nsWindowMediator.cpp → xpfe/appshell/nsWindowMediator.cpp b/xpfe/appshell/src/nsWindowMediator.cpp → xpfe/appshell/nsWindowMediator.cpp
diff --git a/xpfe/appshell/src/nsWindowMediator.h → xpfe/appshell/nsWindowMediator.h b/xpfe/appshell/src/nsWindowMediator.h → xpfe/appshell/nsWindowMediator.h
diff --git a/xpfe/appshell/src/nsXULWindow.cpp → xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp → xpfe/appshell/nsXULWindow.cpp
diff --git a/xpfe/appshell/src/nsXULWindow.h → xpfe/appshell/nsXULWindow.h b/xpfe/appshell/src/nsXULWindow.h → xpfe/appshell/nsXULWindow.h
diff --git a/xpfe/appshell/public/moz.build b/xpfe/appshell/public/moz.build
diff --git a/xpfe/appshell/src/moz.build b/xpfe/appshell/src/moz.build
diff --git a/xpfe/appshell/src/test/chrome.ini → xpfe/appshell/test/chrome.ini b/xpfe/appshell/src/test/chrome.ini → xpfe/appshell/test/chrome.ini
diff --git a/...ell/src/test/test_hiddenPrivateWindow.xul → ...ppshell/test/test_hiddenPrivateWindow.xul b/...ell/src/test/test_hiddenPrivateWindow.xul → ...ppshell/test/test_hiddenPrivateWindow.xul