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

--HG--
rename : xpfe/appshell/public/nsAppShellCID.h => xpfe/appshell/nsAppShellCID.h
rename : xpfe/appshell/src/nsAppShellFactory.cpp => xpfe/appshell/nsAppShellFactory.cpp
rename : xpfe/appshell/src/nsAppShellService.cpp => xpfe/appshell/nsAppShellService.cpp
rename : xpfe/appshell/src/nsAppShellService.h => xpfe/appshell/nsAppShellService.h
rename : xpfe/appshell/src/nsAppShellWindowEnumerator.cpp => xpfe/appshell/nsAppShellWindowEnumerator.cpp
rename : xpfe/appshell/src/nsAppShellWindowEnumerator.h => xpfe/appshell/nsAppShellWindowEnumerator.h
rename : xpfe/appshell/src/nsChromeTreeOwner.cpp => xpfe/appshell/nsChromeTreeOwner.cpp
rename : xpfe/appshell/src/nsChromeTreeOwner.h => xpfe/appshell/nsChromeTreeOwner.h
rename : xpfe/appshell/src/nsContentTreeOwner.cpp => xpfe/appshell/nsContentTreeOwner.cpp
rename : xpfe/appshell/src/nsContentTreeOwner.h => xpfe/appshell/nsContentTreeOwner.h
rename : xpfe/appshell/public/nsIAppShellService.idl => xpfe/appshell/nsIAppShellService.idl
rename : xpfe/appshell/public/nsIPopupWindowManager.idl => xpfe/appshell/nsIPopupWindowManager.idl
rename : xpfe/appshell/public/nsIWindowMediator.idl => xpfe/appshell/nsIWindowMediator.idl
rename : xpfe/appshell/public/nsIWindowMediatorListener.idl => xpfe/appshell/nsIWindowMediatorListener.idl
rename : xpfe/appshell/public/nsIXULBrowserWindow.idl => xpfe/appshell/nsIXULBrowserWindow.idl
rename : xpfe/appshell/public/nsIXULWindow.idl => xpfe/appshell/nsIXULWindow.idl
rename : xpfe/appshell/src/nsWebShellWindow.cpp => xpfe/appshell/nsWebShellWindow.cpp
rename : xpfe/appshell/src/nsWebShellWindow.h => xpfe/appshell/nsWebShellWindow.h
rename : xpfe/appshell/src/nsWindowMediator.cpp => xpfe/appshell/nsWindowMediator.cpp
rename : xpfe/appshell/src/nsWindowMediator.h => xpfe/appshell/nsWindowMediator.h
rename : xpfe/appshell/src/nsXULWindow.cpp => xpfe/appshell/nsXULWindow.cpp
rename : xpfe/appshell/src/nsXULWindow.h => xpfe/appshell/nsXULWindow.h
rename : xpfe/appshell/src/test/chrome.ini => xpfe/appshell/test/chrome.ini
rename : xpfe/appshell/src/test/test_hiddenPrivateWindow.xul => xpfe/appshell/test/test_hiddenPrivateWindow.xul

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'

xpfe/appshell/public/moz.build

@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-XPIDL_SOURCES += [
-    'nsIAppShellService.idl',
-    'nsIPopupWindowManager.idl',
-    'nsIWindowMediator.idl',
-    'nsIWindowMediatorListener.idl',
-    'nsIXULBrowserWindow.idl',
-    'nsIXULWindow.idl',
-]
-
-XPIDL_MODULE = 'appshell'
-
-EXPORTS += [
-    'nsAppShellCID.h',
-]
-

xpfe/appshell/src/moz.build

@@ -1,27 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
-
-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'