Issue %3005 - Move xpfe/appshell to components/

30 files changed, 35 insertions, 167 deletions

diff --git a/components/appshell/moz.build b/components/appshell/moz.build
new file mode 100644
index 000000000..b81b329fe
--- /dev/null
+++ b/components/appshell/moz.build
@@ -0,0 +1,34 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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 += [
+    'public/nsIAppShellService.idl',
+    'public/nsIPopupWindowManager.idl',
+    'public/nsIWindowlessBrowser.idl',
+    'public/nsIWindowMediator.idl',
+    'public/nsIWindowMediatorListener.idl',
+    'public/nsIXULBrowserWindow.idl',
+    'public/nsIXULWindow.idl',
+]
+
+EXPORTS += ['src/nsAppShellCID.h']
+
+UNIFIED_SOURCES += [
+    'src/nsAppShellFactory.cpp',
+    'src/nsAppShellService.cpp',
+    'src/nsAppShellWindowEnumerator.cpp',
+    'src/nsChromeTreeOwner.cpp',
+    'src/nsContentTreeOwner.cpp',
+    'src/nsWebShellWindow.cpp',
+    'src/nsWindowMediator.cpp',
+    'src/nsXULWindow.cpp',
+]
+
+LOCAL_INCLUDES += ['/dom/base']
+
+XPIDL_MODULE = 'appshell'
+FINAL_LIBRARY = 'xul'
+
+include('/ipc/chromium/chromium-config.mozbuild')
\ No newline at end of file
diff --git a/xpfe/appshell/nsIAppShellService.idl b/components/appshell/public/nsIAppShellService.idl
index e7d96a5d1..e7d96a5d1 100644
--- a/xpfe/appshell/nsIAppShellService.idl
+++ b/components/appshell/public/nsIAppShellService.idl
diff --git a/xpfe/appshell/nsIPopupWindowManager.idl b/components/appshell/public/nsIPopupWindowManager.idl
index 4e6cb99b3..4e6cb99b3 100644
--- a/xpfe/appshell/nsIPopupWindowManager.idl
+++ b/components/appshell/public/nsIPopupWindowManager.idl
diff --git a/xpfe/appshell/nsIWindowMediator.idl b/components/appshell/public/nsIWindowMediator.idl
index b38297594..b38297594 100644
--- a/xpfe/appshell/nsIWindowMediator.idl
+++ b/components/appshell/public/nsIWindowMediator.idl
diff --git a/xpfe/appshell/nsIWindowMediatorListener.idl b/components/appshell/public/nsIWindowMediatorListener.idl
index 459e3b6ab..459e3b6ab 100644
--- a/xpfe/appshell/nsIWindowMediatorListener.idl
+++ b/components/appshell/public/nsIWindowMediatorListener.idl
diff --git a/xpfe/appshell/nsIWindowlessBrowser.idl b/components/appshell/public/nsIWindowlessBrowser.idl
index c959e47a4..c959e47a4 100644
--- a/xpfe/appshell/nsIWindowlessBrowser.idl
+++ b/components/appshell/public/nsIWindowlessBrowser.idl
diff --git a/xpfe/appshell/nsIXULBrowserWindow.idl b/components/appshell/public/nsIXULBrowserWindow.idl
index 5dbc2d409..5dbc2d409 100644
--- a/xpfe/appshell/nsIXULBrowserWindow.idl
+++ b/components/appshell/public/nsIXULBrowserWindow.idl
diff --git a/xpfe/appshell/nsIXULWindow.idl b/components/appshell/public/nsIXULWindow.idl
index 8db12adb6..8db12adb6 100644
--- a/xpfe/appshell/nsIXULWindow.idl
+++ b/components/appshell/public/nsIXULWindow.idl
diff --git a/xpfe/appshell/nsAppShellCID.h b/components/appshell/src/nsAppShellCID.h
index 2b0edd4ac..2b0edd4ac 100644
--- a/xpfe/appshell/nsAppShellCID.h
+++ b/components/appshell/src/nsAppShellCID.h
diff --git a/xpfe/appshell/nsAppShellFactory.cpp b/components/appshell/src/nsAppShellFactory.cpp
index 0b6d3c47a..0b6d3c47a 100644
--- a/xpfe/appshell/nsAppShellFactory.cpp
+++ b/components/appshell/src/nsAppShellFactory.cpp
diff --git a/xpfe/appshell/nsAppShellService.cpp b/components/appshell/src/nsAppShellService.cpp
index 868bd7812..868bd7812 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/components/appshell/src/nsAppShellService.cpp
diff --git a/xpfe/appshell/nsAppShellService.h b/components/appshell/src/nsAppShellService.h
index feb7b9947..feb7b9947 100644
--- a/xpfe/appshell/nsAppShellService.h
+++ b/components/appshell/src/nsAppShellService.h
diff --git a/xpfe/appshell/nsAppShellWindowEnumerator.cpp b/components/appshell/src/nsAppShellWindowEnumerator.cpp
index dc5fc120a..dc5fc120a 100644
--- a/xpfe/appshell/nsAppShellWindowEnumerator.cpp
+++ b/components/appshell/src/nsAppShellWindowEnumerator.cpp
diff --git a/xpfe/appshell/nsAppShellWindowEnumerator.h b/components/appshell/src/nsAppShellWindowEnumerator.h
index f9a8a2d52..f9a8a2d52 100644
--- a/xpfe/appshell/nsAppShellWindowEnumerator.h
+++ b/components/appshell/src/nsAppShellWindowEnumerator.h
diff --git a/xpfe/appshell/nsChromeTreeOwner.cpp b/components/appshell/src/nsChromeTreeOwner.cpp
index 63fa86373..63fa86373 100644
--- a/xpfe/appshell/nsChromeTreeOwner.cpp
+++ b/components/appshell/src/nsChromeTreeOwner.cpp
diff --git a/xpfe/appshell/nsChromeTreeOwner.h b/components/appshell/src/nsChromeTreeOwner.h
index 77b0dea89..77b0dea89 100644
--- a/xpfe/appshell/nsChromeTreeOwner.h
+++ b/components/appshell/src/nsChromeTreeOwner.h
diff --git a/xpfe/appshell/nsContentTreeOwner.cpp b/components/appshell/src/nsContentTreeOwner.cpp
index c916f74d0..c916f74d0 100644
--- a/xpfe/appshell/nsContentTreeOwner.cpp
+++ b/components/appshell/src/nsContentTreeOwner.cpp
diff --git a/xpfe/appshell/nsContentTreeOwner.h b/components/appshell/src/nsContentTreeOwner.h
index d6a0d42b3..d6a0d42b3 100644
--- a/xpfe/appshell/nsContentTreeOwner.h
+++ b/components/appshell/src/nsContentTreeOwner.h
diff --git a/xpfe/appshell/nsWebShellWindow.cpp b/components/appshell/src/nsWebShellWindow.cpp
index 7ec39a9cd..7ec39a9cd 100644
--- a/xpfe/appshell/nsWebShellWindow.cpp
+++ b/components/appshell/src/nsWebShellWindow.cpp
diff --git a/xpfe/appshell/nsWebShellWindow.h b/components/appshell/src/nsWebShellWindow.h
index e2b796161..e2b796161 100644
--- a/xpfe/appshell/nsWebShellWindow.h
+++ b/components/appshell/src/nsWebShellWindow.h
diff --git a/xpfe/appshell/nsWindowMediator.cpp b/components/appshell/src/nsWindowMediator.cpp
index 35ae550ae..35ae550ae 100644
--- a/xpfe/appshell/nsWindowMediator.cpp
+++ b/components/appshell/src/nsWindowMediator.cpp
diff --git a/xpfe/appshell/nsWindowMediator.h b/components/appshell/src/nsWindowMediator.h
index a0eaab56d..a0eaab56d 100644
--- a/xpfe/appshell/nsWindowMediator.h
+++ b/components/appshell/src/nsWindowMediator.h
diff --git a/xpfe/appshell/nsXULWindow.cpp b/components/appshell/src/nsXULWindow.cpp
index 45403b2b0..45403b2b0 100644
--- a/xpfe/appshell/nsXULWindow.cpp
+++ b/components/appshell/src/nsXULWindow.cpp
diff --git a/xpfe/appshell/nsXULWindow.h b/components/appshell/src/nsXULWindow.h
index eb059c939..eb059c939 100644
--- a/xpfe/appshell/nsXULWindow.h
+++ b/components/appshell/src/nsXULWindow.h
diff --git a/components/moz.build b/components/moz.build
index 23d2e75db..6e62375d7 100644
--- a/components/moz.build
+++ b/components/moz.build
@@ -15,6 +15,7 @@ DIRS += [
     'addoncompat',
     'alerts',
     'apppicker',
+    'appshell',
     'asyncshutdown',
     'blocklist',
     'bindings',
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index a26235249..41fb8ac6d 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -80,7 +80,6 @@ DIRS += [
     '/layout',
     '/docshell',
     '/embedding',
-    '/xpfe/appshell'
 ]
 
 if CONFIG['MOZ_UNIVERSALCHARDET']:
diff --git a/xpfe/appshell/moz.build b/xpfe/appshell/moz.build
deleted file mode 100644
index cf40fc50e..000000000
--- a/xpfe/appshell/moz.build
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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']
-
-XPIDL_SOURCES += [
-    'nsIAppShellService.idl',
-    'nsIPopupWindowManager.idl',
-    'nsIWindowlessBrowser.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',
-]
-
-FINAL_LIBRARY = 'xul'
-
-include('/ipc/chromium/chromium-config.mozbuild')
\ No newline at end of file
diff --git a/xpfe/appshell/test/chrome.ini b/xpfe/appshell/test/chrome.ini
deleted file mode 100644
index 6f4b72829..000000000
--- a/xpfe/appshell/test/chrome.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-skip-if = os == 'android'
-
-[test_hiddenPrivateWindow.xul]
-[test_windowlessBrowser.xul]
diff --git a/xpfe/appshell/test/test_hiddenPrivateWindow.xul b/xpfe/appshell/test/test_hiddenPrivateWindow.xul
deleted file mode 100644
index a1dfb486d..000000000
--- a/xpfe/appshell/test/test_hiddenPrivateWindow.xul
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=815847
--->
-<window title="Mozilla Bug 815847"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=815847">Mozilla Bug 815847</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-var Cu = Components.utils;
-
-Cu.import('resource://gre/modules/Services.jsm');
-Cu.import('resource://gre/modules/PrivateBrowsingUtils.jsm');
-
-ok(Services.appShell.hiddenWindow, "hiddenWindow should exist");
-ok(Services.appShell.hiddenDOMWindow, "hiddenDOMWindow should exist");
-ok(Services.appShell.hiddenPrivateWindow, "hiddenPrivateWindow should exist");
-ok(Services.appShell.hiddenPrivateDOMWindow, "hiddenPrivateDOMWindow should exist");
-
-ok(!PrivateBrowsingUtils.isWindowPrivate(Services.appShell.hiddenWindow.docShell), "hiddenWindow should not be private");
-ok(!PrivateBrowsingUtils.isWindowPrivate(Services.appShell.hiddenDOMWindow), "hiddenDOMWindow should not be private");
-ok(PrivateBrowsingUtils.isWindowPrivate(Services.appShell.hiddenPrivateWindow.docShell), "hiddenPrivateWindow should be private");
-ok(PrivateBrowsingUtils.isWindowPrivate(Services.appShell.hiddenPrivateDOMWindow), "hiddenPrivateDOMWindow should be private");
-
-]]>
-</script>
-
-</window>
diff --git a/xpfe/appshell/test/test_windowlessBrowser.xul b/xpfe/appshell/test/test_windowlessBrowser.xul
deleted file mode 100644
index ef91f7655..000000000
--- a/xpfe/appshell/test/test_windowlessBrowser.xul
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=815847
--->
-<window title="Mozilla Bug 815847"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-
-<body  xmlns="http://www.w3.org/1999/xhtml">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1214174">Mozilla Bug 1214174</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-var Cu = Components.utils;
-var Ci = Components.interfaces;
-
-Cu.import('resource://gre/modules/Services.jsm');
-
-function testWindowlessBrowser(chromePrivileged) {
-  var webNav = Services.appShell.createWindowlessBrowser(chromePrivileged);
-
-  ok(webNav, "createWindowlessBrowser should return a wevNav");
-
-  let interfaceRequestor = webNav.QueryInterface(Ci.nsIInterfaceRequestor);
-  let docShell = interfaceRequestor.getInterface(Ci.nsIDocShell);
-
-  ok(docShell, "docShell should be defined");
-  ok(docShell.contentViewer.DOMDocument.defaultView, "docShell defaultView should be defined");
-
-  var win = docShell.contentViewer.DOMDocument.defaultView;
-
-  ok(win.screenX == 0, "window.screenX should be 0 in a windowless browser");
-  ok(win.screenY == 0, "window.screenY should be 0 in a windowless browser");
-  ok(win.outerWidth == 0, "window.outerWidth should be 0 in a windowless browser");
-  ok(win.outerHeight == 0, "window.outerHeight should be 0 in a windowless browser");
-  
-  ok(win.sidebar, "window.sidebar should be defined");
-  ok(win.external, "window.external should be defined");
-  
-  var exception;
-
-  try {
-    win.external.AddSearchProvider("http://test-fake.url");
-  } catch(e) {
-    exception = e;
-  }
-  
-  ok(!exception, "window.external.AddSearchProvider should be ignore withour raising an exception");
-
-  webNav.close();
-}
-
-info("Test Bug 1214174 on a content privileged windowless browser");
-testWindowlessBrowser(false);
-
-info("Test Bug 1214174 on a chrome privileged windowless browser");
-testWindowlessBrowser(true);
-
-]]>
-</script>
-
-</window>