Bug 1309049 - move embedding/ files out of that directory, r=jst,mossop
authorMyk Melez <myk@mykzilla.org>
Tue, 10 Jan 2017 10:34:38 -0800
changeset 376493 58c050e010a596a5cbb419472714d2d68b8906c2
parent 376492 d82397413f8fac89d915452fe292a9042fede1d7
child 376494 c246033325458c04e30e27d27f23e5da836fb0eb
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst, mossop
bugs1309049
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1309049 - move embedding/ files out of that directory, r=jst,mossop
.eslintignore
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
docshell/base/moz.build
docshell/base/nsCTooltipTextProvider.h
docshell/base/nsContextMenuInfo.cpp
docshell/base/nsContextMenuInfo.h
docshell/base/nsDocShellTreeOwner.cpp
docshell/base/nsDocShellTreeOwner.h
docshell/base/nsIContextMenuListener.idl
docshell/base/nsIContextMenuListener2.idl
docshell/base/nsITooltipListener.idl
docshell/base/nsITooltipTextProvider.idl
dom/commandhandler/moz.build
dom/commandhandler/nsBaseCommandController.cpp
dom/commandhandler/nsBaseCommandController.h
dom/commandhandler/nsCommandGroup.cpp
dom/commandhandler/nsCommandGroup.h
dom/commandhandler/nsCommandManager.cpp
dom/commandhandler/nsCommandManager.h
dom/commandhandler/nsCommandParams.cpp
dom/commandhandler/nsCommandParams.h
dom/commandhandler/nsControllerCommandTable.cpp
dom/commandhandler/nsControllerCommandTable.h
dom/commandhandler/nsICommandManager.idl
dom/commandhandler/nsICommandParams.idl
dom/commandhandler/nsIControllerCommand.idl
dom/commandhandler/nsIControllerCommandTable.idl
dom/commandhandler/nsIControllerContext.idl
dom/commandhandler/nsPICommandUpdater.idl
dom/ipc/moz.build
dom/moz.build
dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
dom/webbrowserpersist/PWebBrowserPersistResources.ipdl
dom/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
dom/webbrowserpersist/WebBrowserPersistDocumentChild.h
dom/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
dom/webbrowserpersist/WebBrowserPersistDocumentParent.h
dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
dom/webbrowserpersist/WebBrowserPersistLocalDocument.h
dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
dom/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
dom/webbrowserpersist/WebBrowserPersistResourcesChild.h
dom/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
dom/webbrowserpersist/WebBrowserPersistResourcesParent.h
dom/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
dom/webbrowserpersist/WebBrowserPersistSerializeChild.h
dom/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
dom/webbrowserpersist/WebBrowserPersistSerializeParent.h
dom/webbrowserpersist/moz.build
dom/webbrowserpersist/nsCWebBrowserPersist.idl
dom/webbrowserpersist/nsIWebBrowserPersist.idl
dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
dom/webbrowserpersist/nsIWebBrowserPersistable.idl
dom/webbrowserpersist/nsWebBrowserPersist.cpp
dom/webbrowserpersist/nsWebBrowserPersist.h
embedding/browser/build/moz.build
embedding/browser/build/nsWebBrowserModule.cpp
embedding/browser/moz.build
embedding/browser/nsCTooltipTextProvider.h
embedding/browser/nsCWebBrowser.idl
embedding/browser/nsCommandHandler.cpp
embedding/browser/nsCommandHandler.h
embedding/browser/nsContextMenuInfo.cpp
embedding/browser/nsContextMenuInfo.h
embedding/browser/nsDocShellTreeOwner.cpp
embedding/browser/nsDocShellTreeOwner.h
embedding/browser/nsEmbedStream.cpp
embedding/browser/nsEmbedStream.h
embedding/browser/nsICommandHandler.idl
embedding/browser/nsIContextMenuListener.idl
embedding/browser/nsIContextMenuListener2.idl
embedding/browser/nsIEmbeddingSiteWindow.idl
embedding/browser/nsIPrintPreviewNavigation.idl
embedding/browser/nsIPrintingPromptService.idl
embedding/browser/nsITooltipListener.idl
embedding/browser/nsITooltipTextProvider.idl
embedding/browser/nsIWebBrowser.idl
embedding/browser/nsIWebBrowserChrome.idl
embedding/browser/nsIWebBrowserChrome2.idl
embedding/browser/nsIWebBrowserChrome3.idl
embedding/browser/nsIWebBrowserChromeFocus.idl
embedding/browser/nsIWebBrowserFocus.idl
embedding/browser/nsIWebBrowserPrint.idl
embedding/browser/nsIWebBrowserSetup.idl
embedding/browser/nsIWebBrowserStream.idl
embedding/browser/nsWebBrowser.cpp
embedding/browser/nsWebBrowser.h
embedding/browser/nsWebBrowserContentPolicy.cpp
embedding/browser/nsWebBrowserContentPolicy.h
embedding/components/appstartup/moz.build
embedding/components/appstartup/nsAppStartupNotifier.cpp
embedding/components/appstartup/nsAppStartupNotifier.h
embedding/components/appstartup/nsIAppStartupNotifier.h
embedding/components/build/moz.build
embedding/components/build/nsEmbeddingModule.cpp
embedding/components/commandhandler/moz.build
embedding/components/commandhandler/nsBaseCommandController.cpp
embedding/components/commandhandler/nsBaseCommandController.h
embedding/components/commandhandler/nsCommandGroup.cpp
embedding/components/commandhandler/nsCommandGroup.h
embedding/components/commandhandler/nsCommandManager.cpp
embedding/components/commandhandler/nsCommandManager.h
embedding/components/commandhandler/nsCommandParams.cpp
embedding/components/commandhandler/nsCommandParams.h
embedding/components/commandhandler/nsControllerCommandTable.cpp
embedding/components/commandhandler/nsControllerCommandTable.h
embedding/components/commandhandler/nsICommandManager.idl
embedding/components/commandhandler/nsICommandParams.idl
embedding/components/commandhandler/nsIControllerCommand.idl
embedding/components/commandhandler/nsIControllerCommandTable.idl
embedding/components/commandhandler/nsIControllerContext.idl
embedding/components/commandhandler/nsPICommandUpdater.idl
embedding/components/find/moz.build
embedding/components/find/nsFind.cpp
embedding/components/find/nsFind.h
embedding/components/find/nsIFind.idl
embedding/components/find/nsIWebBrowserFind.idl
embedding/components/find/nsWebBrowserFind.cpp
embedding/components/find/nsWebBrowserFind.h
embedding/components/moz.build
embedding/components/printingui/ipc/PPrintProgressDialog.ipdl
embedding/components/printingui/ipc/PPrintSettingsDialog.ipdl
embedding/components/printingui/ipc/PPrinting.ipdl
embedding/components/printingui/ipc/PPrintingTypes.ipdlh
embedding/components/printingui/ipc/PrintDataUtils.cpp
embedding/components/printingui/ipc/PrintDataUtils.h
embedding/components/printingui/ipc/PrintProgressDialogChild.cpp
embedding/components/printingui/ipc/PrintProgressDialogChild.h
embedding/components/printingui/ipc/PrintProgressDialogParent.cpp
embedding/components/printingui/ipc/PrintProgressDialogParent.h
embedding/components/printingui/ipc/PrintSettingsDialogChild.cpp
embedding/components/printingui/ipc/PrintSettingsDialogChild.h
embedding/components/printingui/ipc/PrintSettingsDialogParent.cpp
embedding/components/printingui/ipc/PrintSettingsDialogParent.h
embedding/components/printingui/ipc/PrintingParent.cpp
embedding/components/printingui/ipc/PrintingParent.h
embedding/components/printingui/ipc/moz.build
embedding/components/printingui/ipc/nsPrintingProxy.cpp
embedding/components/printingui/ipc/nsPrintingProxy.h
embedding/components/printingui/mac/moz.build
embedding/components/printingui/mac/nsPrintProgress.cpp
embedding/components/printingui/mac/nsPrintProgress.h
embedding/components/printingui/mac/nsPrintProgressParams.cpp
embedding/components/printingui/mac/nsPrintProgressParams.h
embedding/components/printingui/mac/nsPrintingPromptService.h
embedding/components/printingui/mac/nsPrintingPromptServiceX.mm
embedding/components/printingui/moz.build
embedding/components/printingui/unixshared/moz.build
embedding/components/printingui/unixshared/nsPrintProgress.cpp
embedding/components/printingui/unixshared/nsPrintProgress.h
embedding/components/printingui/unixshared/nsPrintProgressParams.cpp
embedding/components/printingui/unixshared/nsPrintProgressParams.h
embedding/components/printingui/unixshared/nsPrintingPromptService.cpp
embedding/components/printingui/unixshared/nsPrintingPromptService.h
embedding/components/printingui/win/moz.build
embedding/components/printingui/win/nsPrintDialogUtil.cpp
embedding/components/printingui/win/nsPrintDialogUtil.h
embedding/components/printingui/win/nsPrintProgress.cpp
embedding/components/printingui/win/nsPrintProgress.h
embedding/components/printingui/win/nsPrintProgressParams.cpp
embedding/components/printingui/win/nsPrintProgressParams.h
embedding/components/printingui/win/nsPrintingPromptService.cpp
embedding/components/printingui/win/nsPrintingPromptService.h
embedding/components/webbrowserpersist/PWebBrowserPersistDocument.ipdl
embedding/components/webbrowserpersist/PWebBrowserPersistResources.ipdl
embedding/components/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.h
embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.h
embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.h
embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.h
embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.h
embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.h
embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.h
embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.h
embedding/components/webbrowserpersist/moz.build
embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl
embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl
embedding/components/webbrowserpersist/nsIWebBrowserPersistDocument.idl
embedding/components/webbrowserpersist/nsIWebBrowserPersistable.idl
embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
embedding/components/webbrowserpersist/nsWebBrowserPersist.h
embedding/components/windowwatcher/moz.build
embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp
embedding/components/windowwatcher/nsAutoWindowStateHelper.h
embedding/components/windowwatcher/nsDialogParamBlock.cpp
embedding/components/windowwatcher/nsDialogParamBlock.h
embedding/components/windowwatcher/nsIDialogParamBlock.idl
embedding/components/windowwatcher/nsIPromptFactory.idl
embedding/components/windowwatcher/nsIPromptService.idl
embedding/components/windowwatcher/nsIPromptService2.idl
embedding/components/windowwatcher/nsIWindowWatcher.idl
embedding/components/windowwatcher/nsPIPromptService.idl
embedding/components/windowwatcher/nsPIWindowWatcher.idl
embedding/components/windowwatcher/nsPromptUtils.h
embedding/components/windowwatcher/nsWindowWatcher.cpp
embedding/components/windowwatcher/nsWindowWatcher.h
embedding/components/windowwatcher/test/browser.ini
embedding/components/windowwatcher/test/browser_new_content_window_chromeflags.js
embedding/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
embedding/components/windowwatcher/test/browser_new_remote_window_flags.js
embedding/components/windowwatcher/test/browser_new_sized_window.js
embedding/components/windowwatcher/test/chrome.ini
embedding/components/windowwatcher/test/file_storage_copied.html
embedding/components/windowwatcher/test/file_test_dialog.html
embedding/components/windowwatcher/test/mochitest.ini
embedding/components/windowwatcher/test/moz.build
embedding/components/windowwatcher/test/test_blank_named_window.html
embedding/components/windowwatcher/test/test_dialog_arguments.html
embedding/components/windowwatcher/test/test_modal_windows.html
embedding/components/windowwatcher/test/test_named_window.html
embedding/components/windowwatcher/test/test_storage_copied.html
embedding/moz.build
embedding/nsEmbedCID.h
embedding/nsIWindowCreator.idl
embedding/nsIWindowCreator2.idl
embedding/nsIWindowProvider.idl
embedding/test/320x240.ogv
embedding/test/browser.ini
embedding/test/browser_bug1204626.js
embedding/test/bug1170334_iframe.xml
embedding/test/bug1170334_style.css
embedding/test/bug1204626_doc0.html
embedding/test/bug1204626_doc1.html
embedding/test/bug293834_form.html
embedding/test/bug449141_page.html
embedding/test/chrome.ini
embedding/test/mochitest.ini
embedding/test/moz.build
embedding/test/test_bug1170334_wbp_xmlstyle.html
embedding/test/test_bug1192654.html
embedding/test/test_bug293834.html
embedding/test/test_bug449141.html
embedding/test/test_bug499115.html
embedding/test/test_nsFind.html
embedding/test/test_private_window_from_content.html
embedding/test/test_window_open_position_constraint.html
embedding/test/test_window_open_units.html
embedding/tests/unit/test_wwauthpromptfactory.js
embedding/tests/unit/test_wwpromptfactory.js
embedding/tests/unit/xpcshell.ini
mobile/android/components/PromptService.js
mobile/android/installer/package-manifest.in
toolkit/components/browser/build/moz.build
toolkit/components/browser/build/nsWebBrowserModule.cpp
toolkit/components/browser/moz.build
toolkit/components/browser/nsCWebBrowser.idl
toolkit/components/browser/nsCommandHandler.cpp
toolkit/components/browser/nsCommandHandler.h
toolkit/components/browser/nsEmbedCID.h
toolkit/components/browser/nsEmbedStream.cpp
toolkit/components/browser/nsEmbedStream.h
toolkit/components/browser/nsICommandHandler.idl
toolkit/components/browser/nsIEmbeddingSiteWindow.idl
toolkit/components/browser/nsIPrintPreviewNavigation.idl
toolkit/components/browser/nsIPrintingPromptService.idl
toolkit/components/browser/nsIWebBrowser.idl
toolkit/components/browser/nsIWebBrowserChrome.idl
toolkit/components/browser/nsIWebBrowserChrome2.idl
toolkit/components/browser/nsIWebBrowserChrome3.idl
toolkit/components/browser/nsIWebBrowserChromeFocus.idl
toolkit/components/browser/nsIWebBrowserFocus.idl
toolkit/components/browser/nsIWebBrowserPrint.idl
toolkit/components/browser/nsIWebBrowserSetup.idl
toolkit/components/browser/nsIWebBrowserStream.idl
toolkit/components/browser/nsWebBrowser.cpp
toolkit/components/browser/nsWebBrowser.h
toolkit/components/browser/nsWebBrowserContentPolicy.cpp
toolkit/components/browser/nsWebBrowserContentPolicy.h
toolkit/components/find/moz.build
toolkit/components/find/nsFind.cpp
toolkit/components/find/nsFind.h
toolkit/components/find/nsIFind.idl
toolkit/components/find/nsIWebBrowserFind.idl
toolkit/components/find/nsWebBrowserFind.cpp
toolkit/components/find/nsWebBrowserFind.h
toolkit/components/moz.build
toolkit/components/printingui/ipc/PPrintProgressDialog.ipdl
toolkit/components/printingui/ipc/PPrintSettingsDialog.ipdl
toolkit/components/printingui/ipc/PPrinting.ipdl
toolkit/components/printingui/ipc/PPrintingTypes.ipdlh
toolkit/components/printingui/ipc/PrintDataUtils.cpp
toolkit/components/printingui/ipc/PrintDataUtils.h
toolkit/components/printingui/ipc/PrintProgressDialogChild.cpp
toolkit/components/printingui/ipc/PrintProgressDialogChild.h
toolkit/components/printingui/ipc/PrintProgressDialogParent.cpp
toolkit/components/printingui/ipc/PrintProgressDialogParent.h
toolkit/components/printingui/ipc/PrintSettingsDialogChild.cpp
toolkit/components/printingui/ipc/PrintSettingsDialogChild.h
toolkit/components/printingui/ipc/PrintSettingsDialogParent.cpp
toolkit/components/printingui/ipc/PrintSettingsDialogParent.h
toolkit/components/printingui/ipc/PrintingParent.cpp
toolkit/components/printingui/ipc/PrintingParent.h
toolkit/components/printingui/ipc/moz.build
toolkit/components/printingui/ipc/nsPrintingProxy.cpp
toolkit/components/printingui/ipc/nsPrintingProxy.h
toolkit/components/printingui/mac/moz.build
toolkit/components/printingui/mac/nsPrintProgress.cpp
toolkit/components/printingui/mac/nsPrintProgress.h
toolkit/components/printingui/mac/nsPrintProgressParams.cpp
toolkit/components/printingui/mac/nsPrintProgressParams.h
toolkit/components/printingui/mac/nsPrintingPromptService.h
toolkit/components/printingui/mac/nsPrintingPromptServiceX.mm
toolkit/components/printingui/moz.build
toolkit/components/printingui/unixshared/moz.build
toolkit/components/printingui/unixshared/nsPrintProgress.cpp
toolkit/components/printingui/unixshared/nsPrintProgress.h
toolkit/components/printingui/unixshared/nsPrintProgressParams.cpp
toolkit/components/printingui/unixshared/nsPrintProgressParams.h
toolkit/components/printingui/unixshared/nsPrintingPromptService.cpp
toolkit/components/printingui/unixshared/nsPrintingPromptService.h
toolkit/components/printingui/win/moz.build
toolkit/components/printingui/win/nsPrintDialogUtil.cpp
toolkit/components/printingui/win/nsPrintDialogUtil.h
toolkit/components/printingui/win/nsPrintProgress.cpp
toolkit/components/printingui/win/nsPrintProgress.h
toolkit/components/printingui/win/nsPrintProgressParams.cpp
toolkit/components/printingui/win/nsPrintProgressParams.h
toolkit/components/printingui/win/nsPrintingPromptService.cpp
toolkit/components/printingui/win/nsPrintingPromptService.h
toolkit/components/windowcreator/moz.build
toolkit/components/windowcreator/nsIWindowCreator.idl
toolkit/components/windowcreator/nsIWindowCreator2.idl
toolkit/components/windowcreator/nsIWindowProvider.idl
toolkit/components/windowcreator/test/320x240.ogv
toolkit/components/windowcreator/test/browser.ini
toolkit/components/windowcreator/test/browser_bug1204626.js
toolkit/components/windowcreator/test/bug1170334_iframe.xml
toolkit/components/windowcreator/test/bug1170334_style.css
toolkit/components/windowcreator/test/bug1204626_doc0.html
toolkit/components/windowcreator/test/bug1204626_doc1.html
toolkit/components/windowcreator/test/bug293834_form.html
toolkit/components/windowcreator/test/bug449141_page.html
toolkit/components/windowcreator/test/chrome.ini
toolkit/components/windowcreator/test/mochitest.ini
toolkit/components/windowcreator/test/moz.build
toolkit/components/windowcreator/test/test_bug1170334_wbp_xmlstyle.html
toolkit/components/windowcreator/test/test_bug1192654.html
toolkit/components/windowcreator/test/test_bug293834.html
toolkit/components/windowcreator/test/test_bug449141.html
toolkit/components/windowcreator/test/test_bug499115.html
toolkit/components/windowcreator/test/test_nsFind.html
toolkit/components/windowcreator/test/test_private_window_from_content.html
toolkit/components/windowcreator/test/test_window_open_position_constraint.html
toolkit/components/windowcreator/test/test_window_open_units.html
toolkit/components/windowcreator/tests/unit/test_wwauthpromptfactory.js
toolkit/components/windowcreator/tests/unit/test_wwpromptfactory.js
toolkit/components/windowcreator/tests/unit/xpcshell.ini
toolkit/components/windowwatcher/moz.build
toolkit/components/windowwatcher/nsAutoWindowStateHelper.cpp
toolkit/components/windowwatcher/nsAutoWindowStateHelper.h
toolkit/components/windowwatcher/nsDialogParamBlock.cpp
toolkit/components/windowwatcher/nsDialogParamBlock.h
toolkit/components/windowwatcher/nsIDialogParamBlock.idl
toolkit/components/windowwatcher/nsIPromptFactory.idl
toolkit/components/windowwatcher/nsIPromptService.idl
toolkit/components/windowwatcher/nsIPromptService2.idl
toolkit/components/windowwatcher/nsIWindowWatcher.idl
toolkit/components/windowwatcher/nsPIPromptService.idl
toolkit/components/windowwatcher/nsPIWindowWatcher.idl
toolkit/components/windowwatcher/nsPromptUtils.h
toolkit/components/windowwatcher/nsWindowWatcher.cpp
toolkit/components/windowwatcher/nsWindowWatcher.h
toolkit/components/windowwatcher/test/browser.ini
toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
toolkit/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
toolkit/components/windowwatcher/test/browser_new_sized_window.js
toolkit/components/windowwatcher/test/chrome.ini
toolkit/components/windowwatcher/test/file_storage_copied.html
toolkit/components/windowwatcher/test/file_test_dialog.html
toolkit/components/windowwatcher/test/mochitest.ini
toolkit/components/windowwatcher/test/moz.build
toolkit/components/windowwatcher/test/test_blank_named_window.html
toolkit/components/windowwatcher/test/test_dialog_arguments.html
toolkit/components/windowwatcher/test/test_modal_windows.html
toolkit/components/windowwatcher/test/test_named_window.html
toolkit/components/windowwatcher/test/test_storage_copied.html
toolkit/toolkit.mozbuild
toolkit/xre/moz.build
toolkit/xre/nsAppStartupNotifier.cpp
toolkit/xre/nsAppStartupNotifier.h
toolkit/xre/nsEmbeddingModule.cpp
toolkit/xre/nsIAppStartupNotifier.h
--- a/.eslintignore
+++ b/.eslintignore
@@ -192,16 +192,18 @@ toolkit/components/help/**
 # Intentionally invalid JS
 toolkit/components/workerloader/tests/moduleF-syntax-error.js
 
 # Tests old non-star function generators
 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/**
 toolkit/components/reader/Readability.js
 toolkit/components/reader/JSDOMParser.js
 
 # Uses preprocessing
 toolkit/content/widgets/wizard.xml
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -194,26 +194,24 @@
 @RESPATH@/components/dom_xbl.xpt
 @RESPATH@/components/dom_xhr.xpt
 @RESPATH@/components/dom_xpath.xpt
 @RESPATH@/components/dom_xul.xpt
 @RESPATH@/components/dom_time.xpt
 @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
 @RESPATH@/components/fastfind.xpt
 @RESPATH@/components/feeds.xpt
 #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
 @RESPATH@/components/html5.xpt
 @RESPATH@/components/htmlparser.xpt
 @RESPATH@/components/identity.xpt
 @RESPATH@/components/imglib2.xpt
 @RESPATH@/components/inspector.xpt
@@ -304,16 +302,17 @@
 @RESPATH@/components/webshell_idls.xpt
 @RESPATH@/components/widget.xpt
 #ifdef XP_MACOSX
 @RESPATH@/components/widget_cocoa.xpt
 #endif
 #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
 @RESPATH@/components/xpcom_system.xpt
 @RESPATH@/components/xpcom_components.xpt
 @RESPATH@/components/xpcom_ds.xpt
 @RESPATH@/components/xpcom_io.xpt
 @RESPATH@/components/xpcom_threads.xpt
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -218,26 +218,24 @@
 @RESPATH@/components/dom_workers.xpt
 @RESPATH@/components/dom_xbl.xpt
 @RESPATH@/components/dom_xhr.xpt
 @RESPATH@/components/dom_xpath.xpt
 @RESPATH@/components/dom_xul.xpt
 @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
 @RESPATH@/components/fastfind.xpt
 @RESPATH@/components/feeds.xpt
 #ifdef MOZ_GTK
 @RESPATH@/components/filepicker.xpt
 #endif
-@RESPATH@/components/find.xpt
 @RESPATH@/components/gfx.xpt
 @RESPATH@/components/html5.xpt
 @RESPATH@/components/htmlparser.xpt
 @RESPATH@/components/identity.xpt
 @RESPATH@/components/imglib2.xpt
 @RESPATH@/components/inspector.xpt
 @RESPATH@/components/intl.xpt
 @RESPATH@/components/jar.xpt
@@ -322,16 +320,17 @@
 @RESPATH@/components/uriloader.xpt
 @RESPATH@/components/urlformatter.xpt
 @RESPATH@/components/webBrowser_core.xpt
 @RESPATH@/components/webbrowserpersist.xpt
 @RESPATH@/components/widget.xpt
 #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
 @RESPATH@/components/xpcom_system.xpt
 @RESPATH@/components/xpcom_components.xpt
 @RESPATH@/components/xpcom_ds.xpt
 @RESPATH@/components/xpcom_io.xpt
 @RESPATH@/components/xpcom_threads.xpt
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -10,76 +10,86 @@ DIRS += [
 
 XPIDL_SOURCES += [
     'nsCDefaultURIFixup.idl',
     'nsIClipboardCommands.idl',
     'nsIContentViewer.idl',
     'nsIContentViewerContainer.idl',
     'nsIContentViewerEdit.idl',
     'nsIContentViewerFile.idl',
+    'nsIContextMenuListener.idl',
+    'nsIContextMenuListener2.idl',
     'nsIDocCharset.idl',
     'nsIDocShell.idl',
     'nsIDocShellLoadInfo.idl',
     'nsIDocShellTreeItem.idl',
     'nsIDocShellTreeOwner.idl',
     'nsIDocumentLoaderFactory.idl',
     'nsIDownloadHistory.idl',
     'nsIGlobalHistory2.idl',
     'nsILoadContext.idl',
     'nsIPrivacyTransitionObserver.idl',
     'nsIReflowObserver.idl',
     'nsIRefreshURI.idl',
     'nsIScrollable.idl',
     'nsITextScroll.idl',
+    'nsITooltipListener.idl',
+    'nsITooltipTextProvider.idl',
     'nsIURIFixup.idl',
     'nsIWebNavigation.idl',
     'nsIWebNavigationInfo.idl',
     'nsIWebPageDescriptor.idl',
 ]
 
 XPIDL_MODULE = 'docshell'
 
 EXPORTS += [
+    'nsCTooltipTextProvider.h',
     'nsDocShellLoadTypes.h',
+    'nsDocShellTreeOwner.h',
     'nsILinkHandler.h',
     'nsIScrollObserver.h',
     'nsIWebShellServices.h',
     'SerializedLoadContext.h',
 ]
 
 EXPORTS.mozilla += [
     'IHistory.h',
     'LoadContext.h',
 ]
 
 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',
     'SerializedLoadContext.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/docshell/shistory',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
+    '/layout/style',
     '/layout/xul',
     '/netwerk/protocol/viewsource',
+    '/toolkit/components/browser',
     '/tools/profiler',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     DEFINES['MOZ_TOOLKIT_SEARCH'] = True
 
 if CONFIG['MOZ_DEVTOOLS'] == 'all':
     DEFINES['MOZ_DEVTOOLS_ALL'] = True
rename from embedding/browser/nsCTooltipTextProvider.h
rename to docshell/base/nsCTooltipTextProvider.h
rename from embedding/browser/nsContextMenuInfo.cpp
rename to docshell/base/nsContextMenuInfo.cpp
rename from embedding/browser/nsContextMenuInfo.h
rename to docshell/base/nsContextMenuInfo.h
rename from embedding/browser/nsDocShellTreeOwner.cpp
rename to docshell/base/nsDocShellTreeOwner.cpp
rename from embedding/browser/nsDocShellTreeOwner.h
rename to docshell/base/nsDocShellTreeOwner.h
rename from embedding/browser/nsIContextMenuListener.idl
rename to docshell/base/nsIContextMenuListener.idl
rename from embedding/browser/nsIContextMenuListener2.idl
rename to docshell/base/nsIContextMenuListener2.idl
rename from embedding/browser/nsITooltipListener.idl
rename to docshell/base/nsITooltipListener.idl
rename from embedding/browser/nsITooltipTextProvider.idl
rename to docshell/base/nsITooltipTextProvider.idl
rename from embedding/components/commandhandler/moz.build
rename to dom/commandhandler/moz.build
rename from embedding/components/commandhandler/nsBaseCommandController.cpp
rename to dom/commandhandler/nsBaseCommandController.cpp
rename from embedding/components/commandhandler/nsBaseCommandController.h
rename to dom/commandhandler/nsBaseCommandController.h
rename from embedding/components/commandhandler/nsCommandGroup.cpp
rename to dom/commandhandler/nsCommandGroup.cpp
rename from embedding/components/commandhandler/nsCommandGroup.h
rename to dom/commandhandler/nsCommandGroup.h
rename from embedding/components/commandhandler/nsCommandManager.cpp
rename to dom/commandhandler/nsCommandManager.cpp
rename from embedding/components/commandhandler/nsCommandManager.h
rename to dom/commandhandler/nsCommandManager.h
rename from embedding/components/commandhandler/nsCommandParams.cpp
rename to dom/commandhandler/nsCommandParams.cpp
rename from embedding/components/commandhandler/nsCommandParams.h
rename to dom/commandhandler/nsCommandParams.h
rename from embedding/components/commandhandler/nsControllerCommandTable.cpp
rename to dom/commandhandler/nsControllerCommandTable.cpp
rename from embedding/components/commandhandler/nsControllerCommandTable.h
rename to dom/commandhandler/nsControllerCommandTable.h
rename from embedding/components/commandhandler/nsICommandManager.idl
rename to dom/commandhandler/nsICommandManager.idl
rename from embedding/components/commandhandler/nsICommandParams.idl
rename to dom/commandhandler/nsICommandParams.idl
rename from embedding/components/commandhandler/nsIControllerCommand.idl
rename to dom/commandhandler/nsIControllerCommand.idl
rename from embedding/components/commandhandler/nsIControllerCommandTable.idl
rename to dom/commandhandler/nsIControllerCommandTable.idl
rename from embedding/components/commandhandler/nsIControllerContext.idl
rename to dom/commandhandler/nsIControllerContext.idl
rename from embedding/components/commandhandler/nsPICommandUpdater.idl
rename to dom/commandhandler/nsPICommandUpdater.idl
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -121,24 +121,24 @@ LOCAL_INCLUDES += [
     '/dom/devicestorage',
     '/dom/events',
     '/dom/filesystem',
     '/dom/geolocation',
     '/dom/media/webspeech/synth/ipc',
     '/dom/security',
     '/dom/storage',
     '/dom/workers',
-    '/embedding/components/printingui/ipc',
     '/extensions/cookie',
     '/extensions/spellcheck/src',
     '/gfx/2d',
     '/hal/sandbox',
     '/layout/base',
     '/media/webrtc',
     '/netwerk/base',
+    '/toolkit/components/printingui/ipc',
     '/toolkit/crashreporter',
     '/toolkit/xre',
     '/uriloader/exthandler',
     '/widget',
     '/xpcom/base',
     '/xpcom/threads',
 ]
 
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -38,16 +38,17 @@ DIRS += [
     'animation',
     'base',
     'archivereader',
     'bindings',
     'battery',
     'browser-element',
     'cache',
     'canvas',
+    'commandhandler',
     'crypto',
     'devicestorage',
     'encoding',
     'events',
     'fetch',
     'file',
     'filehandle',
     'filesystem',
@@ -91,16 +92,17 @@ DIRS += [
     'xml',
     'xslt',
     'xul',
     'manifest',
     'vr',
     'u2f',
     'console',
     'performance',
+    'webbrowserpersist',
     'xhr',
     'worklet',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_SECUREELEMENT']:
rename from embedding/components/webbrowserpersist/PWebBrowserPersistDocument.ipdl
rename to dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
rename from embedding/components/webbrowserpersist/PWebBrowserPersistResources.ipdl
rename to dom/webbrowserpersist/PWebBrowserPersistResources.ipdl
rename from embedding/components/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
rename to dom/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
rename to dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.h
rename to dom/webbrowserpersist/WebBrowserPersistDocumentChild.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
rename to dom/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.h
rename to dom/webbrowserpersist/WebBrowserPersistDocumentParent.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
rename to dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.h
rename to dom/webbrowserpersist/WebBrowserPersistLocalDocument.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
rename to dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.h
rename to dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
rename to dom/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.h
rename to dom/webbrowserpersist/WebBrowserPersistResourcesChild.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
rename to dom/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.h
rename to dom/webbrowserpersist/WebBrowserPersistResourcesParent.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
rename to dom/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.h
rename to dom/webbrowserpersist/WebBrowserPersistSerializeChild.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
rename to dom/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.h
rename to dom/webbrowserpersist/WebBrowserPersistSerializeParent.h
rename from embedding/components/webbrowserpersist/moz.build
rename to dom/webbrowserpersist/moz.build
rename from embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl
rename to dom/webbrowserpersist/nsCWebBrowserPersist.idl
rename from embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl
rename to dom/webbrowserpersist/nsIWebBrowserPersist.idl
rename from embedding/components/webbrowserpersist/nsIWebBrowserPersistDocument.idl
rename to dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
rename from embedding/components/webbrowserpersist/nsIWebBrowserPersistable.idl
rename to dom/webbrowserpersist/nsIWebBrowserPersistable.idl
rename from embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
rename to dom/webbrowserpersist/nsWebBrowserPersist.cpp
rename from embedding/components/webbrowserpersist/nsWebBrowserPersist.h
rename to dom/webbrowserpersist/nsWebBrowserPersist.h
deleted file mode 100644
--- a/embedding/browser/moz.build
+++ /dev/null
@@ -1,57 +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/.
-
-DIRS += ['build']
-
-XPIDL_SOURCES += [
-    'nsCWebBrowser.idl',
-    'nsICommandHandler.idl',
-    'nsIContextMenuListener.idl',
-    'nsIContextMenuListener2.idl',
-    'nsIEmbeddingSiteWindow.idl',
-    'nsITooltipListener.idl',
-    'nsITooltipTextProvider.idl',
-    'nsIWebBrowser.idl',
-    'nsIWebBrowserChrome.idl',
-    'nsIWebBrowserChrome2.idl',
-    'nsIWebBrowserChrome3.idl',
-    'nsIWebBrowserChromeFocus.idl',
-    'nsIWebBrowserFocus.idl',
-    'nsIWebBrowserSetup.idl',
-    'nsIWebBrowserStream.idl',
-]
-
-if CONFIG['NS_PRINTING']:
-    XPIDL_SOURCES += [
-        'nsIPrintingPromptService.idl',
-        'nsIWebBrowserPrint.idl',
-    ]
-
-XPIDL_MODULE = 'webBrowser_core'
-
-EXPORTS += [
-    'nsCTooltipTextProvider.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsCommandHandler.cpp',
-    'nsContextMenuInfo.cpp',
-    'nsDocShellTreeOwner.cpp',
-    'nsEmbedStream.cpp',
-    'nsWebBrowser.cpp',
-    'nsWebBrowserContentPolicy.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/docshell/base',
-    '/dom/base',
-    '/dom/svg',
-    '/layout/style',
-]
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-error=shadow']
deleted file mode 100644
--- a/embedding/browser/nsIPrintingPromptService.idl
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
-
-/* Doc interface here */
-
-#include "nsISupports.idl"
-#include "nsIWebBrowserPrint.idl"
-#include "nsIWebProgressListener.idl"
-#include "nsIPrintProgressParams.idl"
-#include "nsIPrintSettings.idl"
-#include "nsIObserver.idl"
-
-interface nsIDOMWindow;
-
-[scriptable, uuid(328daa3e-09e4-455f-bb6f-0a921766042f)]
-interface nsIPrintingPromptService : nsISupports
-{
-   /**
-   *  This service enables embedders to implement their own Print and Progress Dialogs.
-   *  Each platform has a "base" or "basckstop" implementation of the service. The 
-   *  service is automatically registered at start up.
-   *
-   *  Historically, platform toolkits with native dialogs have implemented them in the GFX layer
-   *  Usually they were displayed when a new DeviceContextSpec specific to that platform
-   *  was created.
-   *
-   *  Windows: The GFX layer no longers supports default toolkit behavior for displaying the 
-   *           native Print Dialog.
-   *           If an embedder implemented service returns any error code (other than NS_ERROR_ABORT)
-   *           printing will terminate.
-   *
-   *           Returning NS_OK assumes that the PrintSettings object was correctly filled in and
-   *           if it does not have valid fields for printer name, etc. it may also terminate.
-   *
-   *           Defaults for platform service:           
-   *             showPrintDialog       - displays a native dialog
-   *             showPageSetup         - displays a XUL dialog
-   *             showProgress          - displays a XUL dialog
-   *             showPrinterProperties - n/a
-   *
-   *           Summary for Windows Embedders:
-   *             Stated once again: There is no "fallback" native platform support in GFX for the
-   *             displaying of the native print dialog. The current default implementation for Windows
-   *             display a native print dialog but a XUL-based progress dialog.
-   *             If you wish to have a native progress dialog on Windows you will have to create and 
-   *             register your own service.
-   *  
-   *             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
-   *                   is capable of displaying a native print dialog and a XUL progress dialog.
-   *
-   *             To fly your own dialog you may:
-   *
-   *              1) Implement this service to display at least the Print Dialog and a Print Progress Dialog
-   *                 or you may implement just one of the dialogs and pass back NS_ERROR_NOT_IMPLEMENTED
-   *                 for any of the others.
-   *
-   *              2) For the Print Dialog:
-   *                 You may stub out this service by having all the methods return NS_ERROR_NOT_IMPLEMENTED.
-   *                 You can then fly you own dialog and then properly fill in the PrintSettings object
-   *                 before calling nsIWebBrowserPrint's Print method. If you stub out this service  
-   *                 you MUST set "printSilent" to true, if you do not, Printing will terminate and an 
-   *                 error dialog will be displayed.
-   *
-   *  Mac: The GFX layer still supports default toolkit behavior for displaying the Print Dialog.
-   *       If an embedder implemented service returns NS_ERROR_NOT_IMPLEMENTED for "showPrintDialog"
-   *       The toolkit will display the native print dialog.
-   *
-   *       Defaults for platform service:           
-   *       Mac OS9: showPrintDialog       - displays a native dialog
-   *                showPageSetup         - displays a native dialog
-   *                showProgress          - displays a XUL dialog
-   *                showPrinterProperties - n/a
-   *                
-   *       Mac OSX: showPrintDialog       - displays a native dialog
-   *                showPageSetup         - displays a native dialog
-   *                showProgress          - not implemented (provided by OS)
-   *                showPrinterProperties - n/a
-   *                
-   *  GTK: There are no native dialog for GTK.
-   *
-   *       Defaults for platform service:           
-   *         showPrintDialog       - displays a XUL dialog
-   *         showPageSetup         - displays a XUL dialog
-   *         showProgress          - displays a XUL dialog
-   *         showPrinterProperties - displays a XUL dialog
-   *
-   */
- 
-
-
-  /**
-   *  Show the Print Dialog 
-   *
-   *  @param parent - a DOM windows the dialog will be parented to (required)
-   *  @param webBrowserPrint - represents the document to be printed (required)
-   *  @param printSettings - PrintSettings for print "job" (required)
-   *
-   */
-  void showPrintDialog(in mozIDOMWindowProxy parent,
-                       in nsIWebBrowserPrint webBrowserPrint,
-                       in nsIPrintSettings printSettings);
-
-  /**
-   *  Shows the print progress dialog
-   *
-   *  @param parent - a DOM windows the dialog will be parented to
-   *  @param webBrowserPrint - represents the document to be printed
-   *  @param printSettings - PrintSettings for print "job"
-   *  @param openDialogObserver - an observer that will be notifed when the dialog is opened
-   *  @param isForPrinting - true - for printing, false for print preview
-   *  @param webProgressListener - additional listener can be registered for progress notifications
-   *  @param printProgressParams - parameter object for passing progress state
-   *  @param notifyOnOpen - this indicates that the observer will be notified when the progress
-   *                        dialog has been opened. If false is returned it means the observer
-   *                        (usually the caller) shouldn't wait
-   *                        For Print Preview Progress there is intermediate progress
-   */
-  void showProgress(in mozIDOMWindowProxy parent,
-                    in nsIWebBrowserPrint webBrowserPrint,
-                    in nsIPrintSettings printSettings,
-                    in nsIObserver openDialogObserver,
-                    in boolean isForPrinting,
-                    out nsIWebProgressListener webProgressListener,
-                    out nsIPrintProgressParams printProgressParams,
-                    out boolean notifyOnOpen);
-
-  /**
-   *  Shows the print progress dialog
-   *
-   *  @param parent - a DOM windows the dialog will be parented to (required)
-   *  @param printSettings - PrintSettings for page setup (required)
-   *  @param aObs - An observer to know if the contents of the Print Settings 
-   *                object has changed while the dialog is being shown. 
-   *                For example, some platforms may implement an "Apply" button (not required)
-   */
-  void showPageSetup(in mozIDOMWindowProxy parent,
-                     in nsIPrintSettings printSettings,
-                     in nsIObserver aObs);
-
-  /**
-   *  Sometimes platforms need to bring up a special properties dialog for showing
-   *  print specific properties. Although the PrintSettings has a place to set the 
-   *  printer name, here is is an argument to be clear as to what printer is being
-   *  asked to have the properties set for it. The Printer name in the PS is ignored.
-   *
-   *  @param parent - a DOM windows the dialog will be parented to (required)
-   *  @param printerName - name of printer (required)
-   *  @param printSettings - PrintSettings for page setup (required)
-   */
-  void showPrinterProperties(in mozIDOMWindowProxy parent,
-                             in wstring printerName,
-                             in nsIPrintSettings printSettings);
-
-};
-
-%{C++
-// {260FEDC5-524D-4aa6-9A41-E829F4C78B92}
-#define NS_PRINTINGPROMPTSERVICE_IID \
- {0x260fedc5, 0x524d, 0x4aa6, { 0x9a, 0x41, 0xe8, 0x29, 0xf4, 0xc7, 0x8b, 0x92}}
-%}
-
deleted file mode 100644
--- a/embedding/components/appstartup/moz.build
+++ /dev/null
@@ -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'
deleted file mode 100644
--- a/embedding/components/build/moz.build
+++ /dev/null
@@ -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')
deleted file mode 100644
--- a/embedding/components/find/moz.build
+++ /dev/null
@@ -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'
deleted file mode 100644
--- a/embedding/components/moz.build
+++ /dev/null
@@ -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']
deleted file mode 100644
--- a/embedding/moz.build
+++ /dev/null
@@ -1,24 +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/.
-
-DIRS += ['components', 'browser']
-
-TEST_DIRS += ['test']
-
-if CONFIG['ENABLE_TESTS']:
-    XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
-
-XPIDL_SOURCES += [
-    'nsIWindowCreator.idl',
-    'nsIWindowCreator2.idl',
-    'nsIWindowProvider.idl',
-]
-
-XPIDL_MODULE = 'embed_base'
-
-EXPORTS += [
-    'nsEmbedCID.h',
-]
--- a/mobile/android/components/PromptService.js
+++ b/mobile/android/components/PromptService.js
@@ -667,17 +667,17 @@ var PromptUtils = {
       propBag.setProperty("timePasswordChanged", now);
     }
     propBag.setProperty("timeLastUsed", now);
     propBag.setProperty("timesUsedIncrement", 1);
 
     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);
     let isCrossOrig = (aAuthInfo.flags &
                        Ci.nsIAuthInformation.CROSS_ORIGIN_SUB_RESOURCE);
 
     let username = aAuthInfo.username;
     let [displayHost, realm] = this.getAuthTarget(aChannel, aAuthInfo);
@@ -704,17 +704,17 @@ var PromptUtils = {
       text = this.bundle.formatStringFromName("EnterUserPasswordFor2", [displayHost], 1);
     } else {
       text = this.bundle.formatStringFromName("EnterLoginForRealm3", [realm, displayHost], 2);
     }
 
     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 };
     if (aAuthInfo.flags & aAuthInfo.AUTH_PROXY) {
       let proxy = aChannel.QueryInterface(Ci.nsIProxiedChannel);
       res.host = proxy.proxyInfo.host;
       res.port = proxy.proxyInfo.port;
     } else {
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -145,23 +145,21 @@
 #endif
 @BINPATH@/components/dom_xbl.xpt
 @BINPATH@/components/dom_xhr.xpt
 @BINPATH@/components/dom_xpath.xpt
 @BINPATH@/components/dom_xul.xpt
 @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
 @BINPATH@/components/imglib2.xpt
 @BINPATH@/components/inspector.xpt
 @BINPATH@/components/intl.xpt
 @BINPATH@/components/jar.xpt
 @BINPATH@/components/jsdebugger.xpt
@@ -237,16 +235,17 @@
 @BINPATH@/components/unicharutil.xpt
 @BINPATH@/components/update.xpt
 @BINPATH@/components/uriloader.xpt
 @BINPATH@/components/urlformatter.xpt
 @BINPATH@/components/webBrowser_core.xpt
 @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
 @BINPATH@/components/xpcom_system.xpt
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
rename from embedding/browser/build/moz.build
rename to toolkit/components/browser/build/moz.build
rename from embedding/browser/build/nsWebBrowserModule.cpp
rename to toolkit/components/browser/build/nsWebBrowserModule.cpp
new file mode 100644
--- /dev/null
+++ b/toolkit/components/browser/moz.build
@@ -0,0 +1,51 @@
+# -*- 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/.
+
+DIRS += ['build']
+
+XPIDL_SOURCES += [
+    'nsCWebBrowser.idl',
+    'nsICommandHandler.idl',
+    'nsIEmbeddingSiteWindow.idl',
+    'nsIWebBrowser.idl',
+    'nsIWebBrowserChrome.idl',
+    'nsIWebBrowserChrome2.idl',
+    'nsIWebBrowserChrome3.idl',
+    'nsIWebBrowserChromeFocus.idl',
+    'nsIWebBrowserFocus.idl',
+    'nsIWebBrowserSetup.idl',
+    'nsIWebBrowserStream.idl',
+]
+
+if CONFIG['NS_PRINTING']:
+    XPIDL_SOURCES += [
+        'nsIPrintingPromptService.idl',
+        'nsIWebBrowserPrint.idl',
+    ]
+
+XPIDL_MODULE = 'webBrowser_core'
+
+UNIFIED_SOURCES += [
+    'nsCommandHandler.cpp',
+    'nsEmbedStream.cpp',
+    'nsWebBrowser.cpp',
+    'nsWebBrowserContentPolicy.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
+LOCAL_INCLUDES += [
+    '/docshell/base',
+    '/dom/base',
+    '/dom/svg',
+    '/layout/style',
+]
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += ['-Wno-error=shadow']
+
+EXPORTS += [
+    'nsEmbedCID.h',
+]
rename from embedding/browser/nsCWebBrowser.idl
rename to toolkit/components/browser/nsCWebBrowser.idl
rename from embedding/browser/nsCommandHandler.cpp
rename to toolkit/components/browser/nsCommandHandler.cpp
rename from embedding/browser/nsCommandHandler.h
rename to toolkit/components/browser/nsCommandHandler.h
rename from embedding/nsEmbedCID.h
rename to toolkit/components/browser/nsEmbedCID.h
rename from embedding/browser/nsEmbedStream.cpp
rename to toolkit/components/browser/nsEmbedStream.cpp
rename from embedding/browser/nsEmbedStream.h
rename to toolkit/components/browser/nsEmbedStream.h
rename from embedding/browser/nsICommandHandler.idl
rename to toolkit/components/browser/nsICommandHandler.idl
rename from embedding/browser/nsIEmbeddingSiteWindow.idl
rename to toolkit/components/browser/nsIEmbeddingSiteWindow.idl
rename from embedding/browser/nsIPrintPreviewNavigation.idl
rename to toolkit/components/browser/nsIPrintPreviewNavigation.idl
new file mode 100644
--- /dev/null
+++ b/toolkit/components/browser/nsIPrintingPromptService.idl
@@ -0,0 +1,165 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+/* Doc interface here */
+
+#include "nsISupports.idl"
+#include "nsIWebBrowserPrint.idl"
+#include "nsIWebProgressListener.idl"
+#include "nsIPrintProgressParams.idl"
+#include "nsIPrintSettings.idl"
+#include "nsIObserver.idl"
+
+interface nsIDOMWindow;
+
+[scriptable, uuid(328daa3e-09e4-455f-bb6f-0a921766042f)]
+interface nsIPrintingPromptService : nsISupports
+{
+   /**
+   *  This service enables embedders to implement their own Print and Progress Dialogs.
+   *  Each platform has a "base" or "basckstop" implementation of the service. The 
+   *  service is automatically registered at start up.
+   *
+   *  Historically, platform toolkits with native dialogs have implemented them in the GFX layer
+   *  Usually they were displayed when a new DeviceContextSpec specific to that platform
+   *  was created.
+   *
+   *  Windows: The GFX layer no longers supports default toolkit behavior for displaying the 
+   *           native Print Dialog.
+   *           If an embedder implemented service returns any error code (other than NS_ERROR_ABORT)
+   *           printing will terminate.
+   *
+   *           Returning NS_OK assumes that the PrintSettings object was correctly filled in and
+   *           if it does not have valid fields for printer name, etc. it may also terminate.
+   *
+   *           Defaults for platform service:           
+   *             showPrintDialog       - displays a native dialog
+   *             showPageSetup         - displays a XUL dialog
+   *             showProgress          - displays a XUL dialog
+   *             showPrinterProperties - n/a
+   *
+   *           Summary for Windows Embedders:
+   *             Stated once again: There is no "fallback" native platform support in GFX for the
+   *             displaying of the native print dialog. The current default implementation for Windows
+   *             display a native print dialog but a XUL-based progress dialog.
+   *             If you wish to have a native progress dialog on Windows you will have to create and 
+   *             register your own service.
+   *  
+   *             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/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:
+   *
+   *              1) Implement this service to display at least the Print Dialog and a Print Progress Dialog
+   *                 or you may implement just one of the dialogs and pass back NS_ERROR_NOT_IMPLEMENTED
+   *                 for any of the others.
+   *
+   *              2) For the Print Dialog:
+   *                 You may stub out this service by having all the methods return NS_ERROR_NOT_IMPLEMENTED.
+   *                 You can then fly you own dialog and then properly fill in the PrintSettings object
+   *                 before calling nsIWebBrowserPrint's Print method. If you stub out this service  
+   *                 you MUST set "printSilent" to true, if you do not, Printing will terminate and an 
+   *                 error dialog will be displayed.
+   *
+   *  Mac: The GFX layer still supports default toolkit behavior for displaying the Print Dialog.
+   *       If an embedder implemented service returns NS_ERROR_NOT_IMPLEMENTED for "showPrintDialog"
+   *       The toolkit will display the native print dialog.
+   *
+   *       Defaults for platform service:           
+   *       Mac OS9: showPrintDialog       - displays a native dialog
+   *                showPageSetup         - displays a native dialog
+   *                showProgress          - displays a XUL dialog
+   *                showPrinterProperties - n/a
+   *                
+   *       Mac OSX: showPrintDialog       - displays a native dialog
+   *                showPageSetup         - displays a native dialog
+   *                showProgress          - not implemented (provided by OS)
+   *                showPrinterProperties - n/a
+   *                
+   *  GTK: There are no native dialog for GTK.
+   *
+   *       Defaults for platform service:           
+   *         showPrintDialog       - displays a XUL dialog
+   *         showPageSetup         - displays a XUL dialog
+   *         showProgress          - displays a XUL dialog
+   *         showPrinterProperties - displays a XUL dialog
+   *
+   */
+ 
+
+
+  /**
+   *  Show the Print Dialog 
+   *
+   *  @param parent - a DOM windows the dialog will be parented to (required)
+   *  @param webBrowserPrint - represents the document to be printed (required)
+   *  @param printSettings - PrintSettings for print "job" (required)
+   *
+   */
+  void showPrintDialog(in mozIDOMWindowProxy parent,
+                       in nsIWebBrowserPrint webBrowserPrint,
+                       in nsIPrintSettings printSettings);
+
+  /**
+   *  Shows the print progress dialog
+   *
+   *  @param parent - a DOM windows the dialog will be parented to
+   *  @param webBrowserPrint - represents the document to be printed
+   *  @param printSettings - PrintSettings for print "job"
+   *  @param openDialogObserver - an observer that will be notifed when the dialog is opened
+   *  @param isForPrinting - true - for printing, false for print preview
+   *  @param webProgressListener - additional listener can be registered for progress notifications
+   *  @param printProgressParams - parameter object for passing progress state
+   *  @param notifyOnOpen - this indicates that the observer will be notified when the progress
+   *                        dialog has been opened. If false is returned it means the observer
+   *                        (usually the caller) shouldn't wait
+   *                        For Print Preview Progress there is intermediate progress
+   */
+  void showProgress(in mozIDOMWindowProxy parent,
+                    in nsIWebBrowserPrint webBrowserPrint,
+                    in nsIPrintSettings printSettings,
+                    in nsIObserver openDialogObserver,
+                    in boolean isForPrinting,
+                    out nsIWebProgressListener webProgressListener,
+                    out nsIPrintProgressParams printProgressParams,
+                    out boolean notifyOnOpen);
+
+  /**
+   *  Shows the print progress dialog
+   *
+   *  @param parent - a DOM windows the dialog will be parented to (required)
+   *  @param printSettings - PrintSettings for page setup (required)
+   *  @param aObs - An observer to know if the contents of the Print Settings 
+   *                object has changed while the dialog is being shown. 
+   *                For example, some platforms may implement an "Apply" button (not required)
+   */
+  void showPageSetup(in mozIDOMWindowProxy parent,
+                     in nsIPrintSettings printSettings,
+                     in nsIObserver aObs);
+
+  /**
+   *  Sometimes platforms need to bring up a special properties dialog for showing
+   *  print specific properties. Although the PrintSettings has a place to set the 
+   *  printer name, here is is an argument to be clear as to what printer is being
+   *  asked to have the properties set for it. The Printer name in the PS is ignored.
+   *
+   *  @param parent - a DOM windows the dialog will be parented to (required)
+   *  @param printerName - name of printer (required)
+   *  @param printSettings - PrintSettings for page setup (required)
+   */
+  void showPrinterProperties(in mozIDOMWindowProxy parent,
+                             in wstring printerName,
+                             in nsIPrintSettings printSettings);
+
+};
+
+%{C++
+// {260FEDC5-524D-4aa6-9A41-E829F4C78B92}
+#define NS_PRINTINGPROMPTSERVICE_IID \
+ {0x260fedc5, 0x524d, 0x4aa6, { 0x9a, 0x41, 0xe8, 0x29, 0xf4, 0xc7, 0x8b, 0x92}}
+%}
+
rename from embedding/browser/nsIWebBrowser.idl
rename to toolkit/components/browser/nsIWebBrowser.idl
rename from embedding/browser/nsIWebBrowserChrome.idl
rename to toolkit/components/browser/nsIWebBrowserChrome.idl
rename from embedding/browser/nsIWebBrowserChrome2.idl
rename to toolkit/components/browser/nsIWebBrowserChrome2.idl
rename from embedding/browser/nsIWebBrowserChrome3.idl
rename to toolkit/components/browser/nsIWebBrowserChrome3.idl
rename from embedding/browser/nsIWebBrowserChromeFocus.idl
rename to toolkit/components/browser/nsIWebBrowserChromeFocus.idl
rename from embedding/browser/nsIWebBrowserFocus.idl
rename to toolkit/components/browser/nsIWebBrowserFocus.idl
rename from embedding/browser/nsIWebBrowserPrint.idl
rename to toolkit/components/browser/nsIWebBrowserPrint.idl
rename from embedding/browser/nsIWebBrowserSetup.idl
rename to toolkit/components/browser/nsIWebBrowserSetup.idl
rename from embedding/browser/nsIWebBrowserStream.idl
rename to toolkit/components/browser/nsIWebBrowserStream.idl
rename from embedding/browser/nsWebBrowser.cpp
rename to toolkit/components/browser/nsWebBrowser.cpp
rename from embedding/browser/nsWebBrowser.h
rename to toolkit/components/browser/nsWebBrowser.h
rename from embedding/browser/nsWebBrowserContentPolicy.cpp
rename to toolkit/components/browser/nsWebBrowserContentPolicy.cpp
rename from embedding/browser/nsWebBrowserContentPolicy.h
rename to toolkit/components/browser/nsWebBrowserContentPolicy.h
--- a/toolkit/components/find/moz.build
+++ b/toolkit/components/find/moz.build
@@ -1,17 +1,24 @@
 # -*- 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',
     'nsIFindService.idl',
+    'nsIWebBrowserFind.idl',
 ]
 
 XPIDL_MODULE = 'mozfind'
 
+UNIFIED_SOURCES += [
+    'nsFind.cpp',
+    'nsWebBrowserFind.cpp',
+]
+
 SOURCES += [
     'nsFindService.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
rename from embedding/components/find/nsFind.cpp
rename to toolkit/components/find/nsFind.cpp
rename from embedding/components/find/nsFind.h
rename to toolkit/components/find/nsFind.h
rename from embedding/components/find/nsIFind.idl
rename to toolkit/components/find/nsIFind.idl
rename from embedding/components/find/nsIWebBrowserFind.idl
rename to toolkit/components/find/nsIWebBrowserFind.idl
rename from embedding/components/find/nsWebBrowserFind.cpp
rename to toolkit/components/find/nsWebBrowserFind.cpp
rename from embedding/components/find/nsWebBrowserFind.h
rename to toolkit/components/find/nsWebBrowserFind.h
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -12,16 +12,17 @@ DIRS += [
     'aboutcache',
     'aboutcheckerboard',
     'aboutmemory',
     'aboutperformance',
     'addoncompat',
     'alerts',
     'apppicker',
     'asyncshutdown',
+    'browser',
     'commandlines',
     'contentprefs',
     'contextualidentity',
     'crashmonitor',
     'diskspacewatcher',
     'downloads',
     'extensions',
     'exthelper',
@@ -56,16 +57,18 @@ DIRS += [
     'thumbnails',
     'timermanager',
     'tooltiptext',
     'typeaheadfind',
     'utils',
     'url-classifier',
     'urlformatter',
     'viewconfig',
+    'windowcreator',
+    'windowwatcher',
     'workerloader',
     'xulstore'
 ]
 
 if CONFIG['ENABLE_INTL_API']:
     DIRS += ['mozintl']
 
 if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
@@ -79,17 +82,17 @@ if CONFIG['MOZ_CRASHREPORTER']:
 
 if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']
 
 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']
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     DIRS += ['search']
 
 DIRS += ['captivedetect']
rename from embedding/components/printingui/ipc/PPrintProgressDialog.ipdl
rename to toolkit/components/printingui/ipc/PPrintProgressDialog.ipdl
rename from embedding/components/printingui/ipc/PPrintSettingsDialog.ipdl
rename to toolkit/components/printingui/ipc/PPrintSettingsDialog.ipdl
rename from embedding/components/printingui/ipc/PPrinting.ipdl
rename to toolkit/components/printingui/ipc/PPrinting.ipdl
rename from embedding/components/printingui/ipc/PPrintingTypes.ipdlh
rename to toolkit/components/printingui/ipc/PPrintingTypes.ipdlh
rename from embedding/components/printingui/ipc/PrintDataUtils.cpp
rename to toolkit/components/printingui/ipc/PrintDataUtils.cpp
rename from embedding/components/printingui/ipc/PrintDataUtils.h
rename to toolkit/components/printingui/ipc/PrintDataUtils.h
rename from embedding/components/printingui/ipc/PrintProgressDialogChild.cpp
rename to toolkit/components/printingui/ipc/PrintProgressDialogChild.cpp
rename from embedding/components/printingui/ipc/PrintProgressDialogChild.h
rename to toolkit/components/printingui/ipc/PrintProgressDialogChild.h
rename from embedding/components/printingui/ipc/PrintProgressDialogParent.cpp
rename to toolkit/components/printingui/ipc/PrintProgressDialogParent.cpp
rename from embedding/components/printingui/ipc/PrintProgressDialogParent.h
rename to toolkit/components/printingui/ipc/PrintProgressDialogParent.h
rename from embedding/components/printingui/ipc/PrintSettingsDialogChild.cpp
rename to toolkit/components/printingui/ipc/PrintSettingsDialogChild.cpp
rename from embedding/components/printingui/ipc/PrintSettingsDialogChild.h
rename to toolkit/components/printingui/ipc/PrintSettingsDialogChild.h
rename from embedding/components/printingui/ipc/PrintSettingsDialogParent.cpp
rename to toolkit/components/printingui/ipc/PrintSettingsDialogParent.cpp
rename from embedding/components/printingui/ipc/PrintSettingsDialogParent.h
rename to toolkit/components/printingui/ipc/PrintSettingsDialogParent.h
rename from embedding/components/printingui/ipc/PrintingParent.cpp
rename to toolkit/components/printingui/ipc/PrintingParent.cpp
rename from embedding/components/printingui/ipc/PrintingParent.h
rename to toolkit/components/printingui/ipc/PrintingParent.h
rename from embedding/components/printingui/ipc/moz.build
rename to toolkit/components/printingui/ipc/moz.build
rename from embedding/components/printingui/ipc/nsPrintingProxy.cpp
rename to toolkit/components/printingui/ipc/nsPrintingProxy.cpp
rename from embedding/components/printingui/ipc/nsPrintingProxy.h
rename to toolkit/components/printingui/ipc/nsPrintingProxy.h
rename from embedding/components/printingui/mac/moz.build
rename to toolkit/components/printingui/mac/moz.build
rename from embedding/components/printingui/mac/nsPrintProgress.cpp
rename to toolkit/components/printingui/mac/nsPrintProgress.cpp
rename from embedding/components/printingui/mac/nsPrintProgress.h
rename to toolkit/components/printingui/mac/nsPrintProgress.h
rename from embedding/components/printingui/win/nsPrintProgressParams.cpp
rename to toolkit/components/printingui/mac/nsPrintProgressParams.cpp
rename from embedding/components/printingui/mac/nsPrintProgressParams.h
rename to toolkit/components/printingui/mac/nsPrintProgressParams.h
rename from embedding/components/printingui/mac/nsPrintingPromptService.h
rename to toolkit/components/printingui/mac/nsPrintingPromptService.h
rename from embedding/components/printingui/mac/nsPrintingPromptServiceX.mm
rename to toolkit/components/printingui/mac/nsPrintingPromptServiceX.mm
rename from embedding/components/printingui/moz.build
rename to toolkit/components/printingui/moz.build
rename from embedding/components/printingui/unixshared/moz.build
rename to toolkit/components/printingui/unixshared/moz.build
rename from embedding/components/printingui/unixshared/nsPrintProgress.cpp
rename to toolkit/components/printingui/unixshared/nsPrintProgress.cpp
rename from embedding/components/printingui/unixshared/nsPrintProgress.h
rename to toolkit/components/printingui/unixshared/nsPrintProgress.h
rename from embedding/components/printingui/unixshared/nsPrintProgressParams.cpp
rename to toolkit/components/printingui/unixshared/nsPrintProgressParams.cpp
rename from embedding/components/printingui/unixshared/nsPrintProgressParams.h
rename to toolkit/components/printingui/unixshared/nsPrintProgressParams.h
rename from embedding/components/printingui/unixshared/nsPrintingPromptService.cpp
rename to toolkit/components/printingui/unixshared/nsPrintingPromptService.cpp
rename from embedding/components/printingui/unixshared/nsPrintingPromptService.h
rename to toolkit/components/printingui/unixshared/nsPrintingPromptService.h
rename from embedding/components/printingui/win/moz.build
rename to toolkit/components/printingui/win/moz.build
rename from embedding/components/printingui/win/nsPrintDialogUtil.cpp
rename to toolkit/components/printingui/win/nsPrintDialogUtil.cpp
rename from embedding/components/printingui/win/nsPrintDialogUtil.h
rename to toolkit/components/printingui/win/nsPrintDialogUtil.h
rename from embedding/components/printingui/win/nsPrintProgress.cpp
rename to toolkit/components/printingui/win/nsPrintProgress.cpp
rename from embedding/components/printingui/win/nsPrintProgress.h
rename to toolkit/components/printingui/win/nsPrintProgress.h
rename from embedding/components/printingui/mac/nsPrintProgressParams.cpp
rename to toolkit/components/printingui/win/nsPrintProgressParams.cpp
rename from embedding/components/printingui/win/nsPrintProgressParams.h
rename to toolkit/components/printingui/win/nsPrintProgressParams.h
rename from embedding/components/printingui/win/nsPrintingPromptService.cpp
rename to toolkit/components/printingui/win/nsPrintingPromptService.cpp
rename from embedding/components/printingui/win/nsPrintingPromptService.h
rename to toolkit/components/printingui/win/nsPrintingPromptService.h
new file mode 100644
--- /dev/null
+++ b/toolkit/components/windowcreator/moz.build
@@ -0,0 +1,18 @@
+# -*- 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/.
+
+TEST_DIRS += ['test']
+
+if CONFIG['ENABLE_TESTS']:
+    XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
+XPIDL_SOURCES += [
+    'nsIWindowCreator.idl',
+    'nsIWindowCreator2.idl',
+    'nsIWindowProvider.idl',
+]
+
+XPIDL_MODULE = 'windowcreator'
rename from embedding/nsIWindowCreator.idl
rename to toolkit/components/windowcreator/nsIWindowCreator.idl
rename from embedding/nsIWindowCreator2.idl
rename to toolkit/components/windowcreator/nsIWindowCreator2.idl
rename from embedding/nsIWindowProvider.idl
rename to toolkit/components/windowcreator/nsIWindowProvider.idl
rename from embedding/test/320x240.ogv
rename to toolkit/components/windowcreator/test/320x240.ogv
rename from embedding/test/browser.ini
rename to toolkit/components/windowcreator/test/browser.ini
rename from embedding/test/browser_bug1204626.js
rename to toolkit/components/windowcreator/test/browser_bug1204626.js
rename from embedding/test/bug1170334_iframe.xml
rename to toolkit/components/windowcreator/test/bug1170334_iframe.xml
rename from embedding/test/bug1170334_style.css
rename to toolkit/components/windowcreator/test/bug1170334_style.css
rename from embedding/test/bug1204626_doc0.html
rename to toolkit/components/windowcreator/test/bug1204626_doc0.html
rename from embedding/test/bug1204626_doc1.html
rename to toolkit/components/windowcreator/test/bug1204626_doc1.html
rename from embedding/test/bug293834_form.html
rename to toolkit/components/windowcreator/test/bug293834_form.html
rename from embedding/test/bug449141_page.html
rename to toolkit/components/windowcreator/test/bug449141_page.html
rename from embedding/test/chrome.ini
rename to toolkit/components/windowcreator/test/chrome.ini
rename from embedding/test/mochitest.ini
rename to toolkit/components/windowcreator/test/mochitest.ini
rename from embedding/test/moz.build
rename to toolkit/components/windowcreator/test/moz.build
rename from embedding/test/test_bug1170334_wbp_xmlstyle.html
rename to toolkit/components/windowcreator/test/test_bug1170334_wbp_xmlstyle.html
rename from embedding/test/test_bug1192654.html
rename to toolkit/components/windowcreator/test/test_bug1192654.html
rename from embedding/test/test_bug293834.html
rename to toolkit/components/windowcreator/test/test_bug293834.html
rename from embedding/test/test_bug449141.html
rename to toolkit/components/windowcreator/test/test_bug449141.html
rename from embedding/test/test_bug499115.html
rename to toolkit/components/windowcreator/test/test_bug499115.html
rename from embedding/test/test_nsFind.html
rename to toolkit/components/windowcreator/test/test_nsFind.html
rename from embedding/test/test_private_window_from_content.html
rename to toolkit/components/windowcreator/test/test_private_window_from_content.html
rename from embedding/test/test_window_open_position_constraint.html
rename to toolkit/components/windowcreator/test/test_window_open_position_constraint.html
rename from embedding/test/test_window_open_units.html
rename to toolkit/components/windowcreator/test/test_window_open_units.html
rename from embedding/tests/unit/test_wwauthpromptfactory.js
rename to toolkit/components/windowcreator/tests/unit/test_wwauthpromptfactory.js
rename from embedding/tests/unit/test_wwpromptfactory.js
rename to toolkit/components/windowcreator/tests/unit/test_wwpromptfactory.js
rename from embedding/tests/unit/xpcshell.ini
rename to toolkit/components/windowcreator/tests/unit/xpcshell.ini
rename from embedding/components/windowwatcher/moz.build
rename to toolkit/components/windowwatcher/moz.build
rename from embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename to toolkit/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename from embedding/components/windowwatcher/nsAutoWindowStateHelper.h
rename to toolkit/components/windowwatcher/nsAutoWindowStateHelper.h
rename from embedding/components/windowwatcher/nsDialogParamBlock.cpp
rename to toolkit/components/windowwatcher/nsDialogParamBlock.cpp
rename from embedding/components/windowwatcher/nsDialogParamBlock.h
rename to toolkit/components/windowwatcher/nsDialogParamBlock.h
rename from embedding/components/windowwatcher/nsIDialogParamBlock.idl
rename to toolkit/components/windowwatcher/nsIDialogParamBlock.idl
rename from embedding/components/windowwatcher/nsIPromptFactory.idl
rename to toolkit/components/windowwatcher/nsIPromptFactory.idl
rename from embedding/components/windowwatcher/nsIPromptService.idl
rename to toolkit/components/windowwatcher/nsIPromptService.idl
rename from embedding/components/windowwatcher/nsIPromptService2.idl
rename to toolkit/components/windowwatcher/nsIPromptService2.idl
rename from embedding/components/windowwatcher/nsIWindowWatcher.idl
rename to toolkit/components/windowwatcher/nsIWindowWatcher.idl
rename from embedding/components/windowwatcher/nsPIPromptService.idl
rename to toolkit/components/windowwatcher/nsPIPromptService.idl
rename from embedding/components/windowwatcher/nsPIWindowWatcher.idl
rename to toolkit/components/windowwatcher/nsPIWindowWatcher.idl
rename from embedding/components/windowwatcher/nsPromptUtils.h
rename to toolkit/components/windowwatcher/nsPromptUtils.h
rename from embedding/components/windowwatcher/nsWindowWatcher.cpp
rename to toolkit/components/windowwatcher/nsWindowWatcher.cpp
rename from embedding/components/windowwatcher/nsWindowWatcher.h
rename to toolkit/components/windowwatcher/nsWindowWatcher.h
rename from embedding/components/windowwatcher/test/browser.ini
rename to toolkit/components/windowwatcher/test/browser.ini
rename from embedding/components/windowwatcher/test/browser_new_content_window_chromeflags.js
rename to toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
rename from embedding/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
rename to toolkit/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
rename from embedding/components/windowwatcher/test/browser_new_remote_window_flags.js
rename to toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
rename from embedding/components/windowwatcher/test/browser_new_sized_window.js
rename to toolkit/components/windowwatcher/test/browser_new_sized_window.js
rename from embedding/components/windowwatcher/test/chrome.ini
rename to toolkit/components/windowwatcher/test/chrome.ini
rename from embedding/components/windowwatcher/test/file_storage_copied.html
rename to toolkit/components/windowwatcher/test/file_storage_copied.html
rename from embedding/components/windowwatcher/test/file_test_dialog.html
rename to toolkit/components/windowwatcher/test/file_test_dialog.html
rename from embedding/components/windowwatcher/test/mochitest.ini
rename to toolkit/components/windowwatcher/test/mochitest.ini
rename from embedding/components/windowwatcher/test/moz.build
rename to toolkit/components/windowwatcher/test/moz.build
rename from embedding/components/windowwatcher/test/test_blank_named_window.html
rename to toolkit/components/windowwatcher/test/test_blank_named_window.html
rename from embedding/components/windowwatcher/test/test_dialog_arguments.html
rename to toolkit/components/windowwatcher/test/test_dialog_arguments.html
rename from embedding/components/windowwatcher/test/test_modal_windows.html
rename to toolkit/components/windowwatcher/test/test_modal_windows.html
rename from embedding/components/windowwatcher/test/test_named_window.html
rename to toolkit/components/windowwatcher/test/test_named_window.html
rename from embedding/components/windowwatcher/test/test_storage_copied.html
rename to toolkit/components/windowwatcher/test/test_storage_copied.html
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -82,17 +82,16 @@ DIRS += [
     '/gfx',
     '/image',
     '/dom',
     '/view',
     '/widget',
     '/editor',
     '/layout',
     '/docshell',
-    '/embedding',
     '/xpfe/appshell'
 ]
 
 # This needs to be built after the gfx/ directory
 # to ensure all dependencies for skia (e.g. mozalloc, xpcom)
 # have been built
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['/other-licenses/skia-npapi']
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -16,34 +16,45 @@ XPIDL_SOURCES += [
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     XPIDL_SOURCES += [
         'nsIWinAppHelper.idl',
     ]
 
 XPIDL_MODULE = 'xulapp'
 
-EXPORTS += ['nsAppRunner.h']
+EXPORTS += [
+    'nsAppRunner.h',
+    'nsIAppStartupNotifier.h',
+]
 
 if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     EXPORTS += ['EventTracer.h']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     UNIFIED_SOURCES += [
         'nsNativeAppSupportWin.cpp',
     ]
+    DEFINES['PROXY_PRINTING'] = 1
+    LOCAL_INCLUDES += [
+        '../components/printingui/win',
+    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     UNIFIED_SOURCES += [
         'MacApplicationDelegate.mm',
         'MacAutoreleasePool.mm',
         'MacLaunchHelper.mm',
         'nsCommandLineServiceMac.cpp',
         'nsNativeAppSupportCocoa.mm',
         'updaterfileutils_osx.mm',
     ]
+    DEFINES['PROXY_PRINTING'] = 1
+    LOCAL_INCLUDES += [
+        '../components/printingui/mac',
+    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
     UNIFIED_SOURCES += [
         'nsNativeAppSupportDefault.cpp',
         'UIKitDirProvider.mm',
     ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
     UNIFIED_SOURCES += [
         'nsNativeAppSupportUnix.cpp',
@@ -65,17 +76,19 @@ if CONFIG['MOZ_X11']:
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     UNIFIED_SOURCES += [
         'nsAndroidStartup.cpp',
     ]
 
 UNIFIED_SOURCES += [
     'CreateAppData.cpp',
+    'nsAppStartupNotifier.cpp',
     'nsConsoleWriter.cpp',
+    'nsEmbeddingModule.cpp',
     'nsNativeAppSupportBase.cpp',
     'nsSigHandlers.cpp',
     'nsXREDirProvider.cpp',
 ]
 
 # nsAppRunner.cpp and ProfileReset.cpp cannot be built in unified mode because
 # they pull in OS X system headers.
 # nsEmbedFunctions.cpp cannot be built in unified mode because it pulls in X11 headers.
@@ -96,16 +109,22 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     ]
 
 if CONFIG['MOZ_UPDATER']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         UNIFIED_SOURCES += [
             'nsUpdateDriver.cpp',
         ]
 
+if CONFIG['MOZ_PDF_PRINTING']:
+    DEFINES['PROXY_PRINTING'] = 1
+    LOCAL_INCLUDES += [
+        '../components/printingui/unixshared',
+    ]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
     DEFINES['USE_GLX_TEST'] = True
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_VERSION', 'OS_TARGET',
@@ -134,20 +153,25 @@ DEFINES['GRE_MILESTONE'] = CONFIG['GRE_M
 
 for var in ('APP_VERSION', 'APP_ID'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
 
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 LOCAL_INCLUDES += [
+    '../components/find',
+    '../components/printingui/ipc',
+    '../components/windowwatcher',
     '../profile',
     '/config',
     '/dom/base',
+    '/dom/commandhandler',
     '/dom/ipc',
+    '/dom/webbrowserpersist',
     '/testing/gtest/mozilla',
     '/toolkit/crashreporter',
     '/xpcom/build',
 ]
 
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
     LOCAL_INCLUDES += [
         '/security/sandbox/chromium',
rename from embedding/components/appstartup/nsAppStartupNotifier.cpp
rename to toolkit/xre/nsAppStartupNotifier.cpp
rename from embedding/components/appstartup/nsAppStartupNotifier.h
rename to toolkit/xre/nsAppStartupNotifier.h
rename from embedding/components/build/nsEmbeddingModule.cpp
rename to toolkit/xre/nsEmbeddingModule.cpp
rename from embedding/components/appstartup/nsIAppStartupNotifier.h
rename to toolkit/xre/nsIAppStartupNotifier.h