3 files changed, 122 insertions, 0 deletions
diff --git a/browser/components/build/components.conf b/browser/components/build/components.conf
new file mode 100644
index 0000000000..d9079491aa
--- /dev/null
+++ b/browser/components/build/components.conf
@@ -0,0 +1,59 @@
+# -*- 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/.
+
+Classes = []
+
+TOOLKIT = buildconfig.substs['MOZ_WIDGET_TOOLKIT']
+
+shell_service_contracts = [
+    '@mozilla.org/browser/shell-service;1',
+    '@mozilla.org/toolkit/shell-service;1',
+]
+
+if TOOLKIT == 'gtk':
+    Classes += [
+        {
+            'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
+            'contract_ids': shell_service_contracts,
+            'type': 'nsGNOMEShellService',
+            'headers': ['/browser/components/shell/nsGNOMEShellService.h'],
+            'init_method': 'Init',
+        },
+    ]
+elif TOOLKIT == 'cocoa':
+    Classes += [
+        {
+            'cid': '{6fc66a78-6cbc-4b3f-b7ba-379289b29276}',
+            'contract_ids': ['@mozilla.org/mac-attribution;1'],
+            'type': 'nsMacAttributionService',
+            'headers': ['nsMacAttribution.h'],
+        },
+    ]
+
+if buildconfig.substs['OS_ARCH'] == 'Darwin':
+    Classes += [
+        {
+            'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
+            'contract_ids': shell_service_contracts,
+            'type': 'nsMacShellService',
+            'headers': ['/browser/components/shell/nsMacShellService.h'],
+        },
+    ]
+elif buildconfig.substs['OS_ARCH'] == 'WINNT':
+    Classes += [
+        {
+            'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
+            'contract_ids': shell_service_contracts,
+            'type': 'nsWindowsShellService',
+            'headers': ['/browser/components/shell/nsWindowsShellService.h'],
+        },
+        {
+            'cid': '{93480624-806e-4756-b7cb-0fb7dd746a8f}',
+            'contract_ids': ['@mozilla.org/profile/migrator/iehistoryenumerator;1'],
+            'type': 'nsIEHistoryEnumerator',
+            'headers': ['/browser/components/migration/nsIEHistoryEnumerator.h'],
+        },
+    ]
diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
new file mode 100644
index 0000000000..901c6ddfed
--- /dev/null
+++ b/browser/components/build/moz.build
@@ -0,0 +1,22 @@
+# -*- 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/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Firefox Build System", "General")
+
+XPCOM_MANIFESTS += [
+    "components.conf",
+]
+
+Library("browsercomps")
+FINAL_LIBRARY = "xul"
+
+LOCAL_INCLUDES += [
+    "../about",
+    "../migration",
+    "../sessionstore",
+    "../shell",
+]
diff --git a/browser/components/build/nsBrowserCompsCID.h b/browser/components/build/nsBrowserCompsCID.h
new file mode 100644
index 0000000000..a9ce3f47ef
--- /dev/null
+++ b/browser/components/build/nsBrowserCompsCID.h
@@ -0,0 +1,41 @@
+/* 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/. */
+
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef XP_WIN
+#  define NS_WINIEHISTORYENUMERATOR_CID                \
+    {                                                  \
+      0x93480624, 0x806e, 0x4756, {                    \
+        0xb7, 0xcb, 0x0f, 0xb7, 0xdd, 0x74, 0x6a, 0x8f \
+      }                                                \
+    }
+
+#  define NS_IEHISTORYENUMERATOR_CONTRACTID \
+    "@mozilla.org/profile/migrator/iehistoryenumerator;1"
+#endif
+
+#define NS_SHELLSERVICE_CID                         \
+  {                                                 \
+    0x63c7b9f4, 0xcc8, 0x43f8, {                    \
+      0xb6, 0x66, 0xa, 0x66, 0x16, 0x55, 0xcb, 0x73 \
+    }                                               \
+  }
+
+#define NS_SHELLSERVICE_CONTRACTID "@mozilla.org/browser/shell-service;1"
+
+#define NS_RDF_FORWARDPROXY_INFER_DATASOURCE_CID     \
+  {                                                  \
+    0x7a024bcf, 0xedd5, 0x4d9a, {                    \
+      0x86, 0x14, 0xd4, 0x4b, 0xe1, 0xda, 0xda, 0xd3 \
+    }                                                \
+  }
+
+// 136e2c4d-c5a4-477c-b131-d93d7d704f64
+#define NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID      \
+  {                                                  \
+    0x136e2c4d, 0xc5a4, 0x477c, {                    \
+      0xb1, 0x31, 0xd9, 0x3d, 0x7d, 0x70, 0x4f, 0x64 \
+    }                                                \
+  }