Bug 1309049 - move embedding/ files out of that directory, r=jst,mossop

--HG--
rename : embedding/browser/nsCTooltipTextProvider.h => docshell/base/nsCTooltipTextProvider.h
rename : embedding/browser/nsContextMenuInfo.cpp => docshell/base/nsContextMenuInfo.cpp
rename : embedding/browser/nsContextMenuInfo.h => docshell/base/nsContextMenuInfo.h
rename : embedding/browser/nsDocShellTreeOwner.cpp => docshell/base/nsDocShellTreeOwner.cpp
rename : embedding/browser/nsDocShellTreeOwner.h => docshell/base/nsDocShellTreeOwner.h
rename : embedding/browser/nsIContextMenuListener.idl => docshell/base/nsIContextMenuListener.idl
rename : embedding/browser/nsIContextMenuListener2.idl => docshell/base/nsIContextMenuListener2.idl
rename : embedding/browser/nsITooltipListener.idl => docshell/base/nsITooltipListener.idl
rename : embedding/browser/nsITooltipTextProvider.idl => docshell/base/nsITooltipTextProvider.idl
rename : embedding/components/commandhandler/moz.build => dom/commandhandler/moz.build
rename : embedding/components/commandhandler/nsBaseCommandController.cpp => dom/commandhandler/nsBaseCommandController.cpp
rename : embedding/components/commandhandler/nsBaseCommandController.h => dom/commandhandler/nsBaseCommandController.h
rename : embedding/components/commandhandler/nsCommandGroup.cpp => dom/commandhandler/nsCommandGroup.cpp
rename : embedding/components/commandhandler/nsCommandGroup.h => dom/commandhandler/nsCommandGroup.h
rename : embedding/components/commandhandler/nsCommandManager.cpp => dom/commandhandler/nsCommandManager.cpp
rename : embedding/components/commandhandler/nsCommandManager.h => dom/commandhandler/nsCommandManager.h
rename : embedding/components/commandhandler/nsCommandParams.cpp => dom/commandhandler/nsCommandParams.cpp
rename : embedding/components/commandhandler/nsCommandParams.h => dom/commandhandler/nsCommandParams.h
rename : embedding/components/commandhandler/nsControllerCommandTable.cpp => dom/commandhandler/nsControllerCommandTable.cpp
rename : embedding/components/commandhandler/nsControllerCommandTable.h => dom/commandhandler/nsControllerCommandTable.h
rename : embedding/components/commandhandler/nsICommandManager.idl => dom/commandhandler/nsICommandManager.idl
rename : embedding/components/commandhandler/nsICommandParams.idl => dom/commandhandler/nsICommandParams.idl
rename : embedding/components/commandhandler/nsIControllerCommand.idl => dom/commandhandler/nsIControllerCommand.idl
rename : embedding/components/commandhandler/nsIControllerCommandTable.idl => dom/commandhandler/nsIControllerCommandTable.idl
rename : embedding/components/commandhandler/nsIControllerContext.idl => dom/commandhandler/nsIControllerContext.idl
rename : embedding/components/commandhandler/nsPICommandUpdater.idl => dom/commandhandler/nsPICommandUpdater.idl
rename : embedding/components/webbrowserpersist/PWebBrowserPersistDocument.ipdl => dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
rename : embedding/components/webbrowserpersist/PWebBrowserPersistResources.ipdl => dom/webbrowserpersist/PWebBrowserPersistResources.ipdl
rename : embedding/components/webbrowserpersist/PWebBrowserPersistSerialize.ipdl => dom/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.cpp => dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.h => dom/webbrowserpersist/WebBrowserPersistDocumentChild.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.cpp => dom/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.h => dom/webbrowserpersist/WebBrowserPersistDocumentParent.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.cpp => dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.h => dom/webbrowserpersist/WebBrowserPersistLocalDocument.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp => dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.h => dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.cpp => dom/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.h => dom/webbrowserpersist/WebBrowserPersistResourcesChild.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.cpp => dom/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.h => dom/webbrowserpersist/WebBrowserPersistResourcesParent.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.cpp => dom/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.h => dom/webbrowserpersist/WebBrowserPersistSerializeChild.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.cpp => dom/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.h => dom/webbrowserpersist/WebBrowserPersistSerializeParent.h
rename : embedding/components/webbrowserpersist/moz.build => dom/webbrowserpersist/moz.build
rename : embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl => dom/webbrowserpersist/nsCWebBrowserPersist.idl
rename : embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl => dom/webbrowserpersist/nsIWebBrowserPersist.idl
rename : embedding/components/webbrowserpersist/nsIWebBrowserPersistDocument.idl => dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
rename : embedding/components/webbrowserpersist/nsIWebBrowserPersistable.idl => dom/webbrowserpersist/nsIWebBrowserPersistable.idl
rename : embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp => dom/webbrowserpersist/nsWebBrowserPersist.cpp
rename : embedding/components/webbrowserpersist/nsWebBrowserPersist.h => dom/webbrowserpersist/nsWebBrowserPersist.h
rename : embedding/browser/build/moz.build => toolkit/components/browser/build/moz.build
rename : embedding/browser/build/nsWebBrowserModule.cpp => toolkit/components/browser/build/nsWebBrowserModule.cpp
rename : embedding/browser/nsCWebBrowser.idl => toolkit/components/browser/nsCWebBrowser.idl
rename : embedding/browser/nsCommandHandler.cpp => toolkit/components/browser/nsCommandHandler.cpp
rename : embedding/browser/nsCommandHandler.h => toolkit/components/browser/nsCommandHandler.h
rename : embedding/nsEmbedCID.h => toolkit/components/browser/nsEmbedCID.h
rename : embedding/browser/nsEmbedStream.cpp => toolkit/components/browser/nsEmbedStream.cpp
rename : embedding/browser/nsEmbedStream.h => toolkit/components/browser/nsEmbedStream.h
rename : embedding/browser/nsICommandHandler.idl => toolkit/components/browser/nsICommandHandler.idl
rename : embedding/browser/nsIEmbeddingSiteWindow.idl => toolkit/components/browser/nsIEmbeddingSiteWindow.idl
rename : embedding/browser/nsIPrintPreviewNavigation.idl => toolkit/components/browser/nsIPrintPreviewNavigation.idl
rename : embedding/browser/nsIWebBrowser.idl => toolkit/components/browser/nsIWebBrowser.idl
rename : embedding/browser/nsIWebBrowserChrome.idl => toolkit/components/browser/nsIWebBrowserChrome.idl
rename : embedding/browser/nsIWebBrowserChrome2.idl => toolkit/components/browser/nsIWebBrowserChrome2.idl
rename : embedding/browser/nsIWebBrowserChrome3.idl => toolkit/components/browser/nsIWebBrowserChrome3.idl
rename : embedding/browser/nsIWebBrowserChromeFocus.idl => toolkit/components/browser/nsIWebBrowserChromeFocus.idl
rename : embedding/browser/nsIWebBrowserFocus.idl => toolkit/components/browser/nsIWebBrowserFocus.idl
rename : embedding/browser/nsIWebBrowserPrint.idl => toolkit/components/browser/nsIWebBrowserPrint.idl
rename : embedding/browser/nsIWebBrowserSetup.idl => toolkit/components/browser/nsIWebBrowserSetup.idl
rename : embedding/browser/nsIWebBrowserStream.idl => toolkit/components/browser/nsIWebBrowserStream.idl
rename : embedding/browser/nsWebBrowser.cpp => toolkit/components/browser/nsWebBrowser.cpp
rename : embedding/browser/nsWebBrowser.h => toolkit/components/browser/nsWebBrowser.h
rename : embedding/browser/nsWebBrowserContentPolicy.cpp => toolkit/components/browser/nsWebBrowserContentPolicy.cpp
rename : embedding/browser/nsWebBrowserContentPolicy.h => toolkit/components/browser/nsWebBrowserContentPolicy.h
rename : embedding/components/find/nsFind.cpp => toolkit/components/find/nsFind.cpp
rename : embedding/components/find/nsFind.h => toolkit/components/find/nsFind.h
rename : embedding/components/find/nsIFind.idl => toolkit/components/find/nsIFind.idl
rename : embedding/components/find/nsIWebBrowserFind.idl => toolkit/components/find/nsIWebBrowserFind.idl
rename : embedding/components/find/nsWebBrowserFind.cpp => toolkit/components/find/nsWebBrowserFind.cpp
rename : embedding/components/find/nsWebBrowserFind.h => toolkit/components/find/nsWebBrowserFind.h
rename : embedding/components/printingui/ipc/PPrintProgressDialog.ipdl => toolkit/components/printingui/ipc/PPrintProgressDialog.ipdl
rename : embedding/components/printingui/ipc/PPrintSettingsDialog.ipdl => toolkit/components/printingui/ipc/PPrintSettingsDialog.ipdl
rename : embedding/components/printingui/ipc/PPrinting.ipdl => toolkit/components/printingui/ipc/PPrinting.ipdl
rename : embedding/components/printingui/ipc/PPrintingTypes.ipdlh => toolkit/components/printingui/ipc/PPrintingTypes.ipdlh
rename : embedding/components/printingui/ipc/PrintDataUtils.cpp => toolkit/components/printingui/ipc/PrintDataUtils.cpp
rename : embedding/components/printingui/ipc/PrintDataUtils.h => toolkit/components/printingui/ipc/PrintDataUtils.h
rename : embedding/components/printingui/ipc/PrintProgressDialogChild.cpp => toolkit/components/printingui/ipc/PrintProgressDialogChild.cpp
rename : embedding/components/printingui/ipc/PrintProgressDialogChild.h => toolkit/components/printingui/ipc/PrintProgressDialogChild.h
rename : embedding/components/printingui/ipc/PrintProgressDialogParent.cpp => toolkit/components/printingui/ipc/PrintProgressDialogParent.cpp
rename : embedding/components/printingui/ipc/PrintProgressDialogParent.h => toolkit/components/printingui/ipc/PrintProgressDialogParent.h
rename : embedding/components/printingui/ipc/PrintSettingsDialogChild.cpp => toolkit/components/printingui/ipc/PrintSettingsDialogChild.cpp
rename : embedding/components/printingui/ipc/PrintSettingsDialogChild.h => toolkit/components/printingui/ipc/PrintSettingsDialogChild.h
rename : embedding/components/printingui/ipc/PrintSettingsDialogParent.cpp => toolkit/components/printingui/ipc/PrintSettingsDialogParent.cpp
rename : embedding/components/printingui/ipc/PrintSettingsDialogParent.h => toolkit/components/printingui/ipc/PrintSettingsDialogParent.h
rename : embedding/components/printingui/ipc/PrintingParent.cpp => toolkit/components/printingui/ipc/PrintingParent.cpp
rename : embedding/components/printingui/ipc/PrintingParent.h => toolkit/components/printingui/ipc/PrintingParent.h
rename : embedding/components/printingui/ipc/moz.build => toolkit/components/printingui/ipc/moz.build
rename : embedding/components/printingui/ipc/nsPrintingProxy.cpp => toolkit/components/printingui/ipc/nsPrintingProxy.cpp
rename : embedding/components/printingui/ipc/nsPrintingProxy.h => toolkit/components/printingui/ipc/nsPrintingProxy.h
rename : embedding/components/printingui/mac/moz.build => toolkit/components/printingui/mac/moz.build
rename : embedding/components/printingui/mac/nsPrintProgress.cpp => toolkit/components/printingui/mac/nsPrintProgress.cpp
rename : embedding/components/printingui/mac/nsPrintProgress.h => toolkit/components/printingui/mac/nsPrintProgress.h
rename : embedding/components/printingui/win/nsPrintProgressParams.cpp => toolkit/components/printingui/mac/nsPrintProgressParams.cpp
rename : embedding/components/printingui/mac/nsPrintProgressParams.h => toolkit/components/printingui/mac/nsPrintProgressParams.h
rename : embedding/components/printingui/mac/nsPrintingPromptService.h => toolkit/components/printingui/mac/nsPrintingPromptService.h
rename : embedding/components/printingui/mac/nsPrintingPromptServiceX.mm => toolkit/components/printingui/mac/nsPrintingPromptServiceX.mm
rename : embedding/components/printingui/moz.build => toolkit/components/printingui/moz.build
rename : embedding/components/printingui/unixshared/moz.build => toolkit/components/printingui/unixshared/moz.build
rename : embedding/components/printingui/unixshared/nsPrintProgress.cpp => toolkit/components/printingui/unixshared/nsPrintProgress.cpp
rename : embedding/components/printingui/unixshared/nsPrintProgress.h => toolkit/components/printingui/unixshared/nsPrintProgress.h
rename : embedding/components/printingui/unixshared/nsPrintProgressParams.cpp => toolkit/components/printingui/unixshared/nsPrintProgressParams.cpp
rename : embedding/components/printingui/unixshared/nsPrintProgressParams.h => toolkit/components/printingui/unixshared/nsPrintProgressParams.h
rename : embedding/components/printingui/unixshared/nsPrintingPromptService.cpp => toolkit/components/printingui/unixshared/nsPrintingPromptService.cpp
rename : embedding/components/printingui/unixshared/nsPrintingPromptService.h => toolkit/components/printingui/unixshared/nsPrintingPromptService.h
rename : embedding/components/printingui/win/moz.build => toolkit/components/printingui/win/moz.build
rename : embedding/components/printingui/win/nsPrintDialogUtil.cpp => toolkit/components/printingui/win/nsPrintDialogUtil.cpp
rename : embedding/components/printingui/win/nsPrintDialogUtil.h => toolkit/components/printingui/win/nsPrintDialogUtil.h
rename : embedding/components/printingui/win/nsPrintProgress.cpp => toolkit/components/printingui/win/nsPrintProgress.cpp
rename : embedding/components/printingui/win/nsPrintProgress.h => toolkit/components/printingui/win/nsPrintProgress.h
rename : embedding/components/printingui/mac/nsPrintProgressParams.cpp => toolkit/components/printingui/win/nsPrintProgressParams.cpp
rename : embedding/components/printingui/win/nsPrintProgressParams.h => toolkit/components/printingui/win/nsPrintProgressParams.h
rename : embedding/components/printingui/win/nsPrintingPromptService.cpp => toolkit/components/printingui/win/nsPrintingPromptService.cpp
rename : embedding/components/printingui/win/nsPrintingPromptService.h => toolkit/components/printingui/win/nsPrintingPromptService.h
rename : embedding/nsIWindowCreator.idl => toolkit/components/windowcreator/nsIWindowCreator.idl
rename : embedding/nsIWindowCreator2.idl => toolkit/components/windowcreator/nsIWindowCreator2.idl
rename : embedding/nsIWindowProvider.idl => toolkit/components/windowcreator/nsIWindowProvider.idl
rename : embedding/test/320x240.ogv => toolkit/components/windowcreator/test/320x240.ogv
rename : embedding/test/browser.ini => toolkit/components/windowcreator/test/browser.ini
rename : embedding/test/browser_bug1204626.js => toolkit/components/windowcreator/test/browser_bug1204626.js
rename : embedding/test/bug1170334_iframe.xml => toolkit/components/windowcreator/test/bug1170334_iframe.xml
rename : embedding/test/bug1170334_style.css => toolkit/components/windowcreator/test/bug1170334_style.css
rename : embedding/test/bug1204626_doc0.html => toolkit/components/windowcreator/test/bug1204626_doc0.html
rename : embedding/test/bug1204626_doc1.html => toolkit/components/windowcreator/test/bug1204626_doc1.html
rename : embedding/test/bug293834_form.html => toolkit/components/windowcreator/test/bug293834_form.html
rename : embedding/test/bug449141_page.html => toolkit/components/windowcreator/test/bug449141_page.html
rename : embedding/test/chrome.ini => toolkit/components/windowcreator/test/chrome.ini
rename : embedding/test/mochitest.ini => toolkit/components/windowcreator/test/mochitest.ini
rename : embedding/test/moz.build => toolkit/components/windowcreator/test/moz.build
rename : embedding/test/test_bug1170334_wbp_xmlstyle.html => toolkit/components/windowcreator/test/test_bug1170334_wbp_xmlstyle.html
rename : embedding/test/test_bug1192654.html => toolkit/components/windowcreator/test/test_bug1192654.html
rename : embedding/test/test_bug293834.html => toolkit/components/windowcreator/test/test_bug293834.html
rename : embedding/test/test_bug449141.html => toolkit/components/windowcreator/test/test_bug449141.html
rename : embedding/test/test_bug499115.html => toolkit/components/windowcreator/test/test_bug499115.html
rename : embedding/test/test_nsFind.html => toolkit/components/windowcreator/test/test_nsFind.html
rename : embedding/test/test_private_window_from_content.html => toolkit/components/windowcreator/test/test_private_window_from_content.html
rename : embedding/test/test_window_open_position_constraint.html => toolkit/components/windowcreator/test/test_window_open_position_constraint.html
rename : embedding/test/test_window_open_units.html => toolkit/components/windowcreator/test/test_window_open_units.html
rename : embedding/tests/unit/test_wwauthpromptfactory.js => toolkit/components/windowcreator/tests/unit/test_wwauthpromptfactory.js
rename : embedding/tests/unit/test_wwpromptfactory.js => toolkit/components/windowcreator/tests/unit/test_wwpromptfactory.js
rename : embedding/tests/unit/xpcshell.ini => toolkit/components/windowcreator/tests/unit/xpcshell.ini
rename : embedding/components/windowwatcher/moz.build => toolkit/components/windowwatcher/moz.build
rename : embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp => toolkit/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename : embedding/components/windowwatcher/nsAutoWindowStateHelper.h => toolkit/components/windowwatcher/nsAutoWindowStateHelper.h
rename : embedding/components/windowwatcher/nsDialogParamBlock.cpp => toolkit/components/windowwatcher/nsDialogParamBlock.cpp
rename : embedding/components/windowwatcher/nsDialogParamBlock.h => toolkit/components/windowwatcher/nsDialogParamBlock.h
rename : embedding/components/windowwatcher/nsIDialogParamBlock.idl => toolkit/components/windowwatcher/nsIDialogParamBlock.idl
rename : embedding/components/windowwatcher/nsIPromptFactory.idl => toolkit/components/windowwatcher/nsIPromptFactory.idl
rename : embedding/components/windowwatcher/nsIPromptService.idl => toolkit/components/windowwatcher/nsIPromptService.idl
rename : embedding/components/windowwatcher/nsIPromptService2.idl => toolkit/components/windowwatcher/nsIPromptService2.idl
rename : embedding/components/windowwatcher/nsIWindowWatcher.idl => toolkit/components/windowwatcher/nsIWindowWatcher.idl
rename : embedding/components/windowwatcher/nsPIPromptService.idl => toolkit/components/windowwatcher/nsPIPromptService.idl
rename : embedding/components/windowwatcher/nsPIWindowWatcher.idl => toolkit/components/windowwatcher/nsPIWindowWatcher.idl
rename : embedding/components/windowwatcher/nsPromptUtils.h => toolkit/components/windowwatcher/nsPromptUtils.h
rename : embedding/components/windowwatcher/nsWindowWatcher.cpp => toolkit/components/windowwatcher/nsWindowWatcher.cpp
rename : embedding/components/windowwatcher/nsWindowWatcher.h => toolkit/components/windowwatcher/nsWindowWatcher.h
rename : embedding/components/windowwatcher/test/browser.ini => toolkit/components/windowwatcher/test/browser.ini
rename : embedding/components/windowwatcher/test/browser_new_content_window_chromeflags.js => toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
rename : embedding/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js => toolkit/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
rename : embedding/components/windowwatcher/test/browser_new_remote_window_flags.js => toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
rename : embedding/components/windowwatcher/test/browser_new_sized_window.js => toolkit/components/windowwatcher/test/browser_new_sized_window.js
rename : embedding/components/windowwatcher/test/chrome.ini => toolkit/components/windowwatcher/test/chrome.ini
rename : embedding/components/windowwatcher/test/file_storage_copied.html => toolkit/components/windowwatcher/test/file_storage_copied.html
rename : embedding/components/windowwatcher/test/file_test_dialog.html => toolkit/components/windowwatcher/test/file_test_dialog.html
rename : embedding/components/windowwatcher/test/mochitest.ini => toolkit/components/windowwatcher/test/mochitest.ini
rename : embedding/components/windowwatcher/test/moz.build => toolkit/components/windowwatcher/test/moz.build
rename : embedding/components/windowwatcher/test/test_blank_named_window.html => toolkit/components/windowwatcher/test/test_blank_named_window.html
rename : embedding/components/windowwatcher/test/test_dialog_arguments.html => toolkit/components/windowwatcher/test/test_dialog_arguments.html
rename : embedding/components/windowwatcher/test/test_modal_windows.html => toolkit/components/windowwatcher/test/test_modal_windows.html
rename : embedding/components/windowwatcher/test/test_named_window.html => toolkit/components/windowwatcher/test/test_named_window.html
rename : embedding/components/windowwatcher/test/test_storage_copied.html => toolkit/components/windowwatcher/test/test_storage_copied.html
rename : embedding/components/appstartup/nsAppStartupNotifier.cpp => toolkit/xre/nsAppStartupNotifier.cpp
rename : embedding/components/appstartup/nsAppStartupNotifier.h => toolkit/xre/nsAppStartupNotifier.h
rename : embedding/components/build/nsEmbeddingModule.cpp => toolkit/xre/nsEmbeddingModule.cpp
rename : embedding/components/appstartup/nsIAppStartupNotifier.h => toolkit/xre/nsIAppStartupNotifier.h

.eslintignore

@@ -197,6 +197,8 @@ toolkit/modules/tests/xpcshell/test_task.js
 
 # Not yet updated
 toolkit/components/osfile/**
+toolkit/components/windowcreator/**
+toolkit/components/windowwatcher/**
 
 # External code:
 toolkit/components/microformats/test/**

b2g/installer/package-manifest.in

@@ -199,7 +199,6 @@
 @RESPATH@/components/dom_presentation.xpt
 @RESPATH@/components/downloads.xpt
 @RESPATH@/components/editor.xpt
-@RESPATH@/components/embed_base.xpt
 @RESPATH@/components/extensions.xpt
 @RESPATH@/components/exthandler.xpt
 @RESPATH@/components/exthelper.xpt
@@ -208,7 +207,6 @@
 #ifdef MOZ_GTK
 @RESPATH@/components/filepicker.xpt
 #endif
-@RESPATH@/components/find.xpt
 @RESPATH@/components/gfx.xpt
 @RESPATH@/components/gaia_chrome.xpt
 @RESPATH@/components/hal.xpt
@@ -309,6 +307,7 @@
 #ifdef ANDROID
 @RESPATH@/components/widget_android.xpt
 #endif
+@RESPATH@/components/windowcreator.xpt
 @RESPATH@/components/windowds.xpt
 @RESPATH@/components/windowwatcher.xpt
 @RESPATH@/components/xpcom_base.xpt

browser/installer/package-manifest.in

@@ -223,7 +223,6 @@
 @RESPATH@/components/dom_presentation.xpt
 @RESPATH@/components/downloads.xpt
 @RESPATH@/components/editor.xpt
-@RESPATH@/components/embed_base.xpt
 @RESPATH@/components/extensions.xpt
 @RESPATH@/components/exthandler.xpt
 @RESPATH@/components/exthelper.xpt
@@ -232,7 +231,6 @@
 #ifdef MOZ_GTK
 @RESPATH@/components/filepicker.xpt
 #endif
-@RESPATH@/components/find.xpt
 @RESPATH@/components/gfx.xpt
 @RESPATH@/components/html5.xpt
 @RESPATH@/components/htmlparser.xpt
@@ -327,6 +325,7 @@
 #ifdef XP_MACOSX
 @RESPATH@/components/widget_cocoa.xpt
 #endif
+@RESPATH@/components/windowcreator.xpt
 @RESPATH@/components/windowds.xpt
 @RESPATH@/components/windowwatcher.xpt
 @RESPATH@/components/xpcom_base.xpt

docshell/base/moz.build

@@ -15,6 +15,8 @@ XPIDL_SOURCES += [
     'nsIContentViewerContainer.idl',
     'nsIContentViewerEdit.idl',
     'nsIContentViewerFile.idl',
+    'nsIContextMenuListener.idl',
+    'nsIContextMenuListener2.idl',
     'nsIDocCharset.idl',
     'nsIDocShell.idl',
     'nsIDocShellLoadInfo.idl',
@@ -29,6 +31,8 @@ XPIDL_SOURCES += [
     'nsIRefreshURI.idl',
     'nsIScrollable.idl',
     'nsITextScroll.idl',
+    'nsITooltipListener.idl',
+    'nsITooltipTextProvider.idl',
     'nsIURIFixup.idl',
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
@@ -38,7 +42,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'docshell'
 
 EXPORTS += [
+    'nsCTooltipTextProvider.h',
     'nsDocShellLoadTypes.h',
+    'nsDocShellTreeOwner.h',
     'nsILinkHandler.h',
     'nsIScrollObserver.h',
     'nsIWebShellServices.h',
@@ -53,12 +59,14 @@ EXPORTS.mozilla += [
 UNIFIED_SOURCES += [
     'LoadContext.cpp',
     'nsAboutRedirector.cpp',
+    'nsContextMenuInfo.cpp',
     'nsDefaultURIFixup.cpp',
     'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
+    'nsDocShellTreeOwner.cpp',
     'nsDownloadHistory.cpp',
     'nsDSURIContentListener.cpp',
     'nsWebNavigationInfo.cpp',
@@ -73,8 +81,10 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/layout/base',
     '/layout/generic',
+    '/layout/style',
     '/layout/xul',
     '/netwerk/protocol/viewsource',
+    '/toolkit/components/browser',
     '/tools/profiler',
 ]
 

dom/ipc/moz.build

@@ -126,7 +126,6 @@ LOCAL_INCLUDES += [
     '/dom/security',
     '/dom/storage',
     '/dom/workers',
-    '/embedding/components/printingui/ipc',
     '/extensions/cookie',
     '/extensions/spellcheck/src',
     '/gfx/2d',
@@ -134,6 +133,7 @@ LOCAL_INCLUDES += [
     '/layout/base',
     '/media/webrtc',
     '/netwerk/base',
+    '/toolkit/components/printingui/ipc',
     '/toolkit/crashreporter',
     '/toolkit/xre',
     '/uriloader/exthandler',

dom/moz.build

@@ -43,6 +43,7 @@ DIRS += [
     'browser-element',
     'cache',
     'canvas',
+    'commandhandler',
     'crypto',
     'devicestorage',
     'encoding',
@@ -96,6 +97,7 @@ DIRS += [
     'u2f',
     'console',
     'performance',
+    'webbrowserpersist',
     'xhr',
     'worklet',
 ]

embedding/components/appstartup/moz.build

@@ -1,15 +0,0 @@
-# -*- Mode: python; 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/.
-
-EXPORTS += [
-    'nsIAppStartupNotifier.h',
-]
-
-SOURCES += [
-    'nsAppStartupNotifier.cpp',
-]
-
-FINAL_LIBRARY = 'xul'

embedding/components/build/moz.build

@@ -1,38 +0,0 @@
-# -*- Mode: python; 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/.
-
-SOURCES += [
-    'nsEmbeddingModule.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '../appstartup',
-    '../commandhandler',
-    '../find',
-    '../printingui/ipc',
-    '../webbrowserpersist',
-    '../windowwatcher',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    DEFINES['PROXY_PRINTING'] = 1
-    LOCAL_INCLUDES += [
-        '../printingui/win',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    DEFINES['PROXY_PRINTING'] = 1
-    LOCAL_INCLUDES += [
-        '../printingui/mac',
-    ]
-
-if CONFIG['MOZ_PDF_PRINTING']:
-    DEFINES['PROXY_PRINTING'] = 1
-    LOCAL_INCLUDES += [
-        '../printingui/unixshared',
-    ]
-
-include('/ipc/chromium/chromium-config.mozbuild')

embedding/components/find/moz.build

@@ -1,19 +0,0 @@
-# -*- Mode: python; 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 += [
-    'nsIFind.idl',
-    'nsIWebBrowserFind.idl',
-]
-
-XPIDL_MODULE = 'find'
-
-UNIFIED_SOURCES += [
-    'nsFind.cpp',
-    'nsWebBrowserFind.cpp',
-]
-
-FINAL_LIBRARY = 'xul'

embedding/components/moz.build

@@ -1,20 +0,0 @@
-# -*- Mode: python; 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/.
-
-# You'd think we could skip building ui if XUL is disabled,
-# but we need to export interface headers from those directories.
-DIRS += [
-    'windowwatcher',
-    'appstartup',
-    'find',
-    'webbrowserpersist',
-    'commandhandler',
-]
-
-if CONFIG['MOZ_XUL']:
-    DIRS += ['printingui']
-
-DIRS += ['build']

mobile/android/components/PromptService.js

@@ -672,7 +672,7 @@ var PromptUtils = {
     this.pwmgr.modifyLogin(aLogin, propBag);
   },
 
-  // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/nsPrompt.cpp#388
+  // JS port of http://mxr.mozilla.org/mozilla-central/source/toolkit/components/windowwatcher/nsPrompt.cpp#388
   makeDialogText: function pu_makeDialogText(aChannel, aAuthInfo) {
     let isProxy    = (aAuthInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY);
     let isPassOnly = (aAuthInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD);
@@ -709,7 +709,7 @@ var PromptUtils = {
     return text;
   },
 
-  // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/nsPromptUtils.h#89
+  // JS port of http://mxr.mozilla.org/mozilla-central/source/toolkit/components/windowwatcher/nsPromptUtils.h#89
   getAuthHostPort: function pu_getAuthHostPort(aChannel, aAuthInfo) {
     let uri = aChannel.URI;
     let res = { host: null, port: -1 };

mobile/android/installer/package-manifest.in

@@ -150,13 +150,11 @@
 @BINPATH@/components/dom_presentation.xpt
 @BINPATH@/components/downloads.xpt
 @BINPATH@/components/editor.xpt
-@BINPATH@/components/embed_base.xpt
 @BINPATH@/components/extensions.xpt
 @BINPATH@/components/exthandler.xpt
 @BINPATH@/components/exthelper.xpt
 @BINPATH@/components/fastfind.xpt
 @BINPATH@/components/feeds.xpt
-@BINPATH@/components/find.xpt
 @BINPATH@/components/gfx.xpt
 @BINPATH@/components/html5.xpt
 @BINPATH@/components/htmlparser.xpt
@@ -242,6 +240,7 @@
 @BINPATH@/components/webbrowserpersist.xpt
 @BINPATH@/components/widget.xpt
 @BINPATH@/components/widget_android.xpt
+@BINPATH@/components/windowcreator.xpt
 @BINPATH@/components/windowds.xpt
 @BINPATH@/components/windowwatcher.xpt
 @BINPATH@/components/xpcom_base.xpt

toolkit/components/browser/moz.build

@@ -9,11 +9,7 @@ DIRS += ['build']
 XPIDL_SOURCES += [
     'nsCWebBrowser.idl',
     'nsICommandHandler.idl',
-    'nsIContextMenuListener.idl',
-    'nsIContextMenuListener2.idl',
     'nsIEmbeddingSiteWindow.idl',
-    'nsITooltipListener.idl',
-    'nsITooltipTextProvider.idl',
     'nsIWebBrowser.idl',
     'nsIWebBrowserChrome.idl',
     'nsIWebBrowserChrome2.idl',
@@ -32,14 +28,8 @@ if CONFIG['NS_PRINTING']:
 
 XPIDL_MODULE = 'webBrowser_core'
 
-EXPORTS += [
-    'nsCTooltipTextProvider.h',
-]
-
 UNIFIED_SOURCES += [
     'nsCommandHandler.cpp',
-    'nsContextMenuInfo.cpp',
-    'nsDocShellTreeOwner.cpp',
     'nsEmbedStream.cpp',
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
@@ -55,3 +45,7 @@ LOCAL_INCLUDES += [
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+EXPORTS += [
+    'nsEmbedCID.h',
+]

toolkit/components/browser/nsIPrintingPromptService.idl

@@ -49,7 +49,7 @@ interface nsIPrintingPromptService : nsISupports
    *  
    *             Note: The Windows version Mozilla implements this service which is 
    *                   automatically built and registered for you. You can use it as an example.
-   *                   It is located at "mozilla/embedding/components/printingui/win". That service
+   *                   It is located at "mozilla/toolkit/components/printingui/win". That service
    *                   is capable of displaying a native print dialog and a XUL progress dialog.
    *
    *             To fly your own dialog you may:

toolkit/components/find/moz.build

@@ -5,11 +5,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
+    'nsIFind.idl',
     'nsIFindService.idl',
+    'nsIWebBrowserFind.idl',
 ]
 
 XPIDL_MODULE = 'mozfind'
 
+UNIFIED_SOURCES += [
+    'nsFind.cpp',
+    'nsWebBrowserFind.cpp',
+]
+
 SOURCES += [
     'nsFindService.cpp',
 ]

toolkit/components/moz.build

@@ -17,6 +17,7 @@ DIRS += [
     'alerts',
     'apppicker',
     'asyncshutdown',
+    'browser',
     'commandlines',
     'contentprefs',
     'contextualidentity',
@@ -61,6 +62,8 @@ DIRS += [
     'url-classifier',
     'urlformatter',
     'viewconfig',
+    'windowcreator',
+    'windowwatcher',
     'workerloader',
     'xulstore'
 ]
@@ -84,7 +87,7 @@ if CONFIG['MOZ_FEEDS']:
     DIRS += ['feeds']
 
 if CONFIG['MOZ_XUL']:
-    DIRS += ['autocomplete', 'satchel']
+    DIRS += ['autocomplete', 'printingui', 'satchel']
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     DIRS += ['filepicker']