diff --git a/accessible/jsat/Utils.jsm b/accessible/jsat/Utils.jsm
index 81fd537d9db..be4909d94eb 100644
--- a/accessible/jsat/Utils.jsm
+++ b/accessible/jsat/Utils.jsm
@@ -32,6 +32,7 @@ this.EXPORTED_SYMBOLS = ['Utils', 'Logger', 'PivotContext', 'PrefCache',  // jsh
 this.Utils = { // jshint ignore:line
   _buildAppMap: {
     '{3c2e2abc-06d4-11e1-ac3b-374f68613e61}': 'b2g',
+    '{d1bfe7d9-c01e-4237-998b-7b5f960a4314}': 'graphene',
     '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}': 'browser',
     '{aa3c5121-dab2-40e2-81ca-7ea25febc110}': 'mobile/android',
     '{a23983c0-fd0e-11dc-95ff-0800200c9a66}': 'mobile/xul'
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 78257abe3d7..0813397163e 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -325,7 +325,6 @@ pref("media.fragmented-mp4.gonk.enabled", true);
 //Encrypted media extensions.
 pref("media.eme.enabled", true);
 pref("media.eme.apiVisible", true);
-
 // The default number of decoded video frames that are enqueued in
 // MediaDecoderReader's mVideoQueue.
 pref("media.video-queue.default-size", 3);
@@ -431,7 +430,7 @@ pref("dom.ipc.processCount", 100000);
 
 pref("dom.ipc.browser_frames.oop_by_default", false);
 
-#ifndef MOZ_MULET
+#if !defined(MOZ_MULET) && !defined(MOZ_GRAPHENE)
 pref("dom.meta-viewport.enabled", true);
 #endif
 
@@ -1067,11 +1066,18 @@ pref("dom.wakelock.enabled", true);
 // Enable webapps add-ons
 pref("dom.apps.customization.enabled", true);
 
+#ifdef MOZ_GRAPHENE
+// Enable touch caret by default
+pref("touchcaret.enabled", true);
+// Enable selection caret by default
+pref("selectioncaret.enabled", true);
+#else
 // Original caret implementation on collapsed selection.
 pref("touchcaret.enabled", false);
-
 // Original caret implementation on non-collapsed selection.
 pref("selectioncaret.enabled", false);
+#endif
+
 
 // New implementation to unify touch-caret and selection-carets.
 pref("layout.accessiblecaret.enabled", true);
@@ -1150,3 +1156,7 @@ pref("dom.performance.enable_notify_performance_timing", true);
 pref("b2g.multiscreen.chrome_remote_url", "chrome://b2g/content/shell_remote.html");
 pref("b2g.multiscreen.system_remote_url", "index_remote.html");
 
+// Because we can't have nice things.
+#ifdef MOZ_GRAPHENE
+#include ../graphene/graphene.js
+#endif
diff --git a/b2g/app/macbuild/Contents/Info.plist.in b/b2g/app/macbuild/Contents/Info.plist.in
index 7f11efefc6f..d5ea85f4d94 100644
--- a/b2g/app/macbuild/Contents/Info.plist.in
+++ b/b2g/app/macbuild/Contents/Info.plist.in
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>b2g</string>
+	<string>%APP_BINARY%</string>
 	<key>CFBundleGetInfoString</key>
 	<string>%APP_NAME% %APP_VERSION%</string>
 	<key>CFBundleIconFile</key>
@@ -32,5 +32,36 @@
 	<true/>
 	<key>NSPrincipalClass</key>
 	<string>GeckoNSApplication</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleURLName</key>
+			<string>http URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>http</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleURLName</key>
+			<string>https URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>https</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>ftp URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>ftp</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>
diff --git a/b2g/branding/browserhtml/Makefile.in b/b2g/branding/browserhtml/Makefile.in
new file mode 100644
index 00000000000..27e9db651bc
--- /dev/null
+++ b/b2g/branding/browserhtml/Makefile.in
@@ -0,0 +1,30 @@
+# 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/.
+
+include $(topsrcdir)/config/config.mk
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+BRANDING_FILES := \
+	app.ico \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+BRANDING_FILES := \
+	app.icns \
+	background.png \
+	disk.icns \
+	dsstore \
+	$(NULL)
+endif
+
+ifdef MOZ_WIDGET_GTK
+BRANDING_FILES := \
+	default.png \
+	$(NULL)
+endif
+
+BRANDING_DEST := $(DIST)/branding
+BRANDING_TARGET := export
+INSTALL_TARGETS += BRANDING
diff --git a/b2g/branding/browserhtml/app.icns b/b2g/branding/browserhtml/app.icns
new file mode 100644
index 00000000000..3d680134e26
Binary files /dev/null and b/b2g/branding/browserhtml/app.icns differ
diff --git a/b2g/branding/browserhtml/app.ico b/b2g/branding/browserhtml/app.ico
new file mode 100644
index 00000000000..04596e4d060
Binary files /dev/null and b/b2g/branding/browserhtml/app.ico differ
diff --git a/b2g/branding/browserhtml/background.png b/b2g/branding/browserhtml/background.png
new file mode 100644
index 00000000000..db5576a3360
Binary files /dev/null and b/b2g/branding/browserhtml/background.png differ
diff --git a/b2g/branding/browserhtml/configure.sh b/b2g/branding/browserhtml/configure.sh
new file mode 100644
index 00000000000..71c6129d272
--- /dev/null
+++ b/b2g/branding/browserhtml/configure.sh
@@ -0,0 +1,5 @@
+# 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/.
+
+MOZ_APP_DISPLAYNAME=Browser.html
diff --git a/b2g/branding/browserhtml/content/about.png b/b2g/branding/browserhtml/content/about.png
new file mode 100644
index 00000000000..3cc1444f645
Binary files /dev/null and b/b2g/branding/browserhtml/content/about.png differ
diff --git a/b2g/branding/browserhtml/content/favicon32.png b/b2g/branding/browserhtml/content/favicon32.png
new file mode 100644
index 00000000000..ac4a6968bf2
Binary files /dev/null and b/b2g/branding/browserhtml/content/favicon32.png differ
diff --git a/b2g/branding/browserhtml/content/icon48.png b/b2g/branding/browserhtml/content/icon48.png
new file mode 100644
index 00000000000..b7513c2e468
Binary files /dev/null and b/b2g/branding/browserhtml/content/icon48.png differ
diff --git a/b2g/branding/browserhtml/content/icon64.png b/b2g/branding/browserhtml/content/icon64.png
new file mode 100644
index 00000000000..c8bee8fca98
Binary files /dev/null and b/b2g/branding/browserhtml/content/icon64.png differ
diff --git a/b2g/branding/browserhtml/content/jar.mn b/b2g/branding/browserhtml/content/jar.mn
new file mode 100644
index 00000000000..0052ad0243d
--- /dev/null
+++ b/b2g/branding/browserhtml/content/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+chrome.jar:
+% content branding %content/branding/
+  content/branding/about.png                     (about.png)
+  content/branding/logoWordmark.png              (logoWordmark.png)
+  content/branding/logo.png                      (logo.png)
+  content/branding/favicon32.png                 (favicon32.png)
diff --git a/b2g/branding/browserhtml/content/logo.png b/b2g/branding/browserhtml/content/logo.png
new file mode 100644
index 00000000000..9d9d0c57e03
Binary files /dev/null and b/b2g/branding/browserhtml/content/logo.png differ
diff --git a/b2g/branding/browserhtml/content/logoWordmark.png b/b2g/branding/browserhtml/content/logoWordmark.png
new file mode 100644
index 00000000000..878363181ac
Binary files /dev/null and b/b2g/branding/browserhtml/content/logoWordmark.png differ
diff --git a/b2g/branding/browserhtml/content/moz.build b/b2g/branding/browserhtml/content/moz.build
new file mode 100644
index 00000000000..c97072bba2d
--- /dev/null
+++ b/b2g/branding/browserhtml/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/b2g/branding/browserhtml/content/splash.png b/b2g/branding/browserhtml/content/splash.png
new file mode 100644
index 00000000000..84ab581d20e
Binary files /dev/null and b/b2g/branding/browserhtml/content/splash.png differ
diff --git a/b2g/branding/browserhtml/default.png b/b2g/branding/browserhtml/default.png
new file mode 100644
index 00000000000..ae4736223a8
Binary files /dev/null and b/b2g/branding/browserhtml/default.png differ
diff --git a/b2g/branding/browserhtml/disk.icns b/b2g/branding/browserhtml/disk.icns
new file mode 100644
index 00000000000..c49b7b878e4
Binary files /dev/null and b/b2g/branding/browserhtml/disk.icns differ
diff --git a/b2g/branding/browserhtml/dsstore b/b2g/branding/browserhtml/dsstore
new file mode 100644
index 00000000000..657101d6e22
Binary files /dev/null and b/b2g/branding/browserhtml/dsstore differ
diff --git a/b2g/branding/browserhtml/locales/en-US/brand.dtd b/b2g/branding/browserhtml/locales/en-US/brand.dtd
new file mode 100644
index 00000000000..6c3088d70c1
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+
+<!ENTITY  brandShortName  "Browser.html">
+<!ENTITY  brandFullName   "Mozilla Browser.html">
+<!ENTITY  vendorShortName "Mozilla">
diff --git a/b2g/branding/browserhtml/locales/en-US/brand.properties b/b2g/branding/browserhtml/locales/en-US/brand.properties
new file mode 100644
index 00000000000..897d1a8007e
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# 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/.
+
+brandShortName=Browser.html
+brandFullName=Mozilla Browser.html
diff --git a/b2g/branding/browserhtml/locales/jar.mn b/b2g/branding/browserhtml/locales/jar.mn
new file mode 100644
index 00000000000..2ea47e1684a
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# 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/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+  locale/branding/brand.properties (en-US/brand.properties)
diff --git a/b2g/branding/browserhtml/locales/moz.build b/b2g/branding/browserhtml/locales/moz.build
new file mode 100644
index 00000000000..c97072bba2d
--- /dev/null
+++ b/b2g/branding/browserhtml/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/b2g/branding/browserhtml/moz.build b/b2g/branding/browserhtml/moz.build
new file mode 100644
index 00000000000..8f320daeae9
--- /dev/null
+++ b/b2g/branding/browserhtml/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/b2g/branding/horizon/Makefile.in b/b2g/branding/horizon/Makefile.in
new file mode 100644
index 00000000000..27e9db651bc
--- /dev/null
+++ b/b2g/branding/horizon/Makefile.in
@@ -0,0 +1,30 @@
+# 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/.
+
+include $(topsrcdir)/config/config.mk
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+BRANDING_FILES := \
+	app.ico \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+BRANDING_FILES := \
+	app.icns \
+	background.png \
+	disk.icns \
+	dsstore \
+	$(NULL)
+endif
+
+ifdef MOZ_WIDGET_GTK
+BRANDING_FILES := \
+	default.png \
+	$(NULL)
+endif
+
+BRANDING_DEST := $(DIST)/branding
+BRANDING_TARGET := export
+INSTALL_TARGETS += BRANDING
diff --git a/b2g/branding/horizon/app.icns b/b2g/branding/horizon/app.icns
new file mode 100644
index 00000000000..6c7b9f5b500
Binary files /dev/null and b/b2g/branding/horizon/app.icns differ
diff --git a/b2g/branding/horizon/app.ico b/b2g/branding/horizon/app.ico
new file mode 100644
index 00000000000..49eb9041923
Binary files /dev/null and b/b2g/branding/horizon/app.ico differ
diff --git a/b2g/branding/horizon/background.png b/b2g/branding/horizon/background.png
new file mode 100644
index 00000000000..db5576a3360
Binary files /dev/null and b/b2g/branding/horizon/background.png differ
diff --git a/b2g/branding/horizon/configure.sh b/b2g/branding/horizon/configure.sh
new file mode 100644
index 00000000000..65774e3841e
--- /dev/null
+++ b/b2g/branding/horizon/configure.sh
@@ -0,0 +1,5 @@
+# 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/.
+
+MOZ_APP_DISPLAYNAME=Horizon
diff --git a/b2g/branding/horizon/content/about.png b/b2g/branding/horizon/content/about.png
new file mode 100644
index 00000000000..3cc1444f645
Binary files /dev/null and b/b2g/branding/horizon/content/about.png differ
diff --git a/b2g/branding/horizon/content/favicon32.png b/b2g/branding/horizon/content/favicon32.png
new file mode 100644
index 00000000000..ac4a6968bf2
Binary files /dev/null and b/b2g/branding/horizon/content/favicon32.png differ
diff --git a/b2g/branding/horizon/content/icon48.png b/b2g/branding/horizon/content/icon48.png
new file mode 100644
index 00000000000..b7513c2e468
Binary files /dev/null and b/b2g/branding/horizon/content/icon48.png differ
diff --git a/b2g/branding/horizon/content/icon64.png b/b2g/branding/horizon/content/icon64.png
new file mode 100644
index 00000000000..c8bee8fca98
Binary files /dev/null and b/b2g/branding/horizon/content/icon64.png differ
diff --git a/b2g/branding/horizon/content/jar.mn b/b2g/branding/horizon/content/jar.mn
new file mode 100644
index 00000000000..0052ad0243d
--- /dev/null
+++ b/b2g/branding/horizon/content/jar.mn
@@ -0,0 +1,10 @@
+# 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/.
+
+chrome.jar:
+% content branding %content/branding/
+  content/branding/about.png                     (about.png)
+  content/branding/logoWordmark.png              (logoWordmark.png)
+  content/branding/logo.png                      (logo.png)
+  content/branding/favicon32.png                 (favicon32.png)
diff --git a/b2g/branding/horizon/content/logo.png b/b2g/branding/horizon/content/logo.png
new file mode 100644
index 00000000000..9d9d0c57e03
Binary files /dev/null and b/b2g/branding/horizon/content/logo.png differ
diff --git a/b2g/branding/horizon/content/logoWordmark.png b/b2g/branding/horizon/content/logoWordmark.png
new file mode 100644
index 00000000000..878363181ac
Binary files /dev/null and b/b2g/branding/horizon/content/logoWordmark.png differ
diff --git a/b2g/branding/horizon/content/moz.build b/b2g/branding/horizon/content/moz.build
new file mode 100644
index 00000000000..c97072bba2d
--- /dev/null
+++ b/b2g/branding/horizon/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/b2g/branding/horizon/content/splash.png b/b2g/branding/horizon/content/splash.png
new file mode 100644
index 00000000000..84ab581d20e
Binary files /dev/null and b/b2g/branding/horizon/content/splash.png differ
diff --git a/b2g/branding/horizon/default.png b/b2g/branding/horizon/default.png
new file mode 100644
index 00000000000..0e6a4016ca5
Binary files /dev/null and b/b2g/branding/horizon/default.png differ
diff --git a/b2g/branding/horizon/disk.icns b/b2g/branding/horizon/disk.icns
new file mode 100644
index 00000000000..c49b7b878e4
Binary files /dev/null and b/b2g/branding/horizon/disk.icns differ
diff --git a/b2g/branding/horizon/dsstore b/b2g/branding/horizon/dsstore
new file mode 100644
index 00000000000..657101d6e22
Binary files /dev/null and b/b2g/branding/horizon/dsstore differ
diff --git a/b2g/branding/horizon/locales/en-US/brand.dtd b/b2g/branding/horizon/locales/en-US/brand.dtd
new file mode 100644
index 00000000000..ad7a938b56c
--- /dev/null
+++ b/b2g/branding/horizon/locales/en-US/brand.dtd
@@ -0,0 +1,8 @@
+<!-- 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/. -->
+
+<!ENTITY  brandShortName  "Horizon">
+<!ENTITY  brandFullName   "Mozilla Horizon">
+<!ENTITY  vendorShortName "Mozilla">
+<!ENTITY  logoTrademark   "Horizon and the Horizon logos are trademarks of the Mozilla Foundation.">
diff --git a/b2g/branding/horizon/locales/en-US/brand.properties b/b2g/branding/horizon/locales/en-US/brand.properties
new file mode 100644
index 00000000000..ce9e209cff2
--- /dev/null
+++ b/b2g/branding/horizon/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# 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/.
+
+brandShortName=Horizon
+brandFullName=Mozilla Horizon
diff --git a/b2g/branding/horizon/locales/jar.mn b/b2g/branding/horizon/locales/jar.mn
new file mode 100644
index 00000000000..3d32ef1f165
--- /dev/null
+++ b/b2g/branding/horizon/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# 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/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+* locale/branding/brand.properties (en-US/brand.properties)
diff --git a/b2g/branding/horizon/locales/moz.build b/b2g/branding/horizon/locales/moz.build
new file mode 100644
index 00000000000..c97072bba2d
--- /dev/null
+++ b/b2g/branding/horizon/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/b2g/branding/horizon/moz.build b/b2g/branding/horizon/moz.build
new file mode 100644
index 00000000000..8f320daeae9
--- /dev/null
+++ b/b2g/branding/horizon/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/b2g/chrome/content/content.css b/b2g/chrome/content/content.css
index 44907eb2ed6..f8214856aa0 100644
--- a/b2g/chrome/content/content.css
+++ b/b2g/chrome/content/content.css
@@ -11,12 +11,19 @@ xul|window xul|scrollbar {
 }
 
 /* Bug 1041576 - Scrollable with scrollgrab should not have scrollbars */
+
 @-moz-document domain(system.gaiamobile.org) {
   .browser-container > xul|scrollbar {
     display: none;
   }
 }
 
+%ifdef MOZ_GRAPHENE
+.moz-noscrollbars > xul|scrollbar {
+  display: none;
+}
+%endif
+
 xul|scrollbar[root="true"] {
   position: relative;
   z-index: 2147483647;
@@ -85,6 +92,7 @@ xul|scrollbarbutton {
   background-image: none !important;
 }
 
+%ifndef MOZ_GRAPHENE
 /* -moz-touch-enabled? media elements */
 :-moz-any(video, audio) > xul|videocontrols {
   -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
@@ -310,6 +318,7 @@ input[type=number] > div > div, /* work around bug 946184 */
 input[type=number]::-moz-number-spin-box {
   display: none;
 }
+%endif
 
 %ifdef MOZ_WIDGET_GONK
 /* This binding only provide key shortcuts that we can't use on devices */
diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index debf4da7c60..cb7bd396144 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -637,10 +637,18 @@ var settingsToObserve = {
   'layers.draw-borders': false,
   'layers.draw-tile-borders': false,
   'layers.dump': false,
+#ifdef XP_WIN
+  'layers.enable-tiles': false,
+#else
   'layers.enable-tiles': true,
+#endif
   'layers.effect.invert': false,
   'layers.effect.grayscale': false,
   'layers.effect.contrast': '0.0',
+#ifdef MOZ_GRAPHENE
+  // Restart required
+  'layers.async-pan-zoom.enabled': false,
+#endif
   'layout.display-list.dump': false,
   'mms.debugging.enabled': false,
   'network.debugging.enabled': false,
diff --git a/b2g/chrome/content/shell.css b/b2g/chrome/content/shell.css
index 9043feec0c4..3695f3b3591 100644
--- a/b2g/chrome/content/shell.css
+++ b/b2g/chrome/content/shell.css
@@ -25,4 +25,51 @@ iframe {
   top: 0;
   right: 0;
   bottom: 0;
+  z-index: 1;
 }
+
+%ifdef MOZ_GRAPHENE
+
+body.content-loaded > #installing {
+  display: none;
+}
+
+#installing {
+  z-index: 2;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #F1C40F;
+  color: #FFF;
+}
+
+.throbber {
+  width: 3px;
+  height: 3px;
+  border-radius: 100px;
+  background-color: #FFF;
+  animation-name: throbber;
+  animation-duration: 1500ms;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+}
+
+@keyframes throbber{
+  from {
+    transform: scale(0);
+    opacity: 0.4;
+  }
+  to {
+    transform: scale(400);
+    opacity: 0;
+  }
+}
+
+%endif
diff --git a/b2g/chrome/content/shell.html b/b2g/chrome/content/shell.html
index 7d2b620fc7c..4148cb4c654 100644
--- a/b2g/chrome/content/shell.html
+++ b/b2g/chrome/content/shell.html
@@ -8,6 +8,11 @@
       windowtype="navigator:browser"
 #ifdef ANDROID
       sizemode="fullscreen"
+#endif
+#ifdef MOZ_GRAPHENE
+      macanimationtype="document"
+      fullscreenbutton="true"
+      chromemargin="0,0,0,0"
 #endif
       >
 
@@ -26,6 +31,7 @@
           src="chrome://b2g/content/shell.js"> </script>
 
 #ifndef ANDROID
+#ifndef MOZ_GRAPHENE
   <!-- various task that has to happen only on desktop -->
   <script type="application/javascript;version=1.8"
           src="chrome://b2g/content/desktop.js"> </script>
@@ -35,6 +41,7 @@
   <!-- this script handles the "runapp" argument for desktop builds -->
   <script type="application/javascript;version=1.8"
           src="chrome://b2g/content/runapp.js"> </script>
+#endif
 #else
   <!-- this file is only loaded on Gonk to manage ADB state -->
   <script type="application/javascript;version=1.8"
@@ -56,12 +63,19 @@
     </footer>
 #endif
 #endif
+#ifndef MOZ_GRAPHENE
 #ifdef MOZ_WIDGET_COCOA
     <!--
      If the document is empty at startup, we don't display the window
      at all on Mac OS...
     -->
     <h1 id="placeholder">wtf mac os!</h1>
+#endif
+#else
+    <div id="installing">
+      <div class="throbber"></div>
+      <div class="message"></div>
+    </div>
 #endif
     <!-- The html:iframe containing the UI is created here. -->
   </body>
diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index 8b336df56b5..4d457dc1408 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -87,6 +87,39 @@ function debug(str) {
   dump(' -*- Shell.js: ' + str + '\n');
 }
 
+const once = event => {
+  let target = shell.contentBrowser;
+  return new Promise((resolve, reject) => {
+    target.addEventListener(event, function gotEvent(evt) {
+      target.removeEventListener(event, gotEvent, false);
+      resolve(evt);
+    }, false);
+  });
+}
+
+function clearCache() {
+  let cache = Cc["@mozilla.org/netwerk/cache-storage-service;1"]
+                .getService(Ci.nsICacheStorageService);
+  cache.clear();
+}
+
+function clearCacheAndReload() {
+  // Reload the main frame with a cleared cache.
+  debug('Reloading ' + getContentWindow().location);
+  clearCache();
+  getContentWindow().location.reload(true);
+  once('mozbrowserlocationchange').then(
+    evt => {
+      shell.sendEvent(window, "ContentStart");
+    });
+}
+
+function restart() {
+  let appStartup = Cc['@mozilla.org/toolkit/app-startup;1']
+                     .getService(Ci.nsIAppStartup);
+  appStartup.quit(Ci.nsIAppStartup.eForceQuit | Ci.nsIAppStartup.eRestart);
+}
+
 #ifdef MOZ_CRASHREPORTER
 function debugCrashReport(aStr) {
   dump('Crash reporter : ' + aStr);
@@ -244,8 +277,32 @@ var shell = {
       let startManifestURL =
         Cc['@mozilla.org/commandlinehandler/general-startup;1?type=b2gbootstrap']
           .getService(Ci.nsISupports).wrappedJSObject.startManifestURL;
+
+#ifdef MOZ_GRAPHENE
+      // If --start-manifest hasn't been specified, we re-use the latest specified manifest.
+      // If it's the first launch, we will fallback to b2g.default.start_manifest_url
+      if (!startManifestURL) {
+        try {
+          startManifestURL = Services.prefs.getCharPref("b2g.system_manifest_url");
+        } catch(e) {}
+      }
+#endif
+
+      if (!startManifestURL) {
+        try {
+          startManifestURL = Services.prefs.getCharPref("b2g.default.start_manifest_url");
+        } catch(e) {}
+      }
+
       if (startManifestURL) {
         Cu.import('resource://gre/modules/Bootstraper.jsm');
+#ifdef MOZ_GRAPHENE
+        if (Bootstraper.isInstallRequired(startManifestURL)) {
+          // Installing the app my take some time. We don't want to keep the
+          // native window hidden.
+          showInstallScreen();
+        }
+#endif
         Bootstraper.ensureSystemAppInstall(startManifestURL)
                    .then(this.start.bind(this))
                    .catch(Bootstraper.bailout);
@@ -337,11 +394,14 @@ var shell = {
 #endif
     this.contentBrowser = container.appendChild(systemAppFrame);
 
-    systemAppFrame.contentWindow
-                  .QueryInterface(Ci.nsIInterfaceRequestor)
-                  .getInterface(Ci.nsIWebNavigation)
-                  .sessionHistory = Cc["@mozilla.org/browser/shistory;1"]
-                                      .createInstance(Ci.nsISHistory);
+    let webNav = systemAppFrame.contentWindow
+                               .QueryInterface(Ci.nsIInterfaceRequestor)
+                               .getInterface(Ci.nsIWebNavigation);
+    webNav.sessionHistory = Cc["@mozilla.org/browser/shistory;1"].createInstance(Ci.nsISHistory);
+
+#ifdef MOZ_GRAPHENE
+    webNav.QueryInterface(Ci.nsIDocShell).windowDraggingAllowed = true;
+#endif
 
     this.allowedAudioChannels = new Map();
     let audioChannels = systemAppFrame.allowedAudioChannels;
@@ -464,11 +524,34 @@ var shell = {
   visibleNormalAudioActive: false,
 
   handleEvent: function shell_handleEvent(evt) {
+    function checkReloadKey() {
+      if (evt.type !== 'keyup') {
+        return false;
+      }
+
+      try {
+        let key = JSON.parse(Services.prefs.getCharPref('b2g.reload_key'));
+        return (evt.keyCode  == key.key   &&
+                evt.ctrlKey  == key.ctrl  &&
+                evt.altKey   == key.alt   &&
+                evt.shiftKey == key.shift &&
+                evt.metaKey  == key.meta);
+      } catch(e) {
+        debug('Failed to get key: ' + e);
+      }
+
+      return false;
+    }
+
     let content = this.contentBrowser.contentWindow;
     switch (evt.type) {
       case 'keydown':
       case 'keyup':
-        this.broadcastHardwareKeys(evt);
+        if (checkReloadKey()) {
+          clearCacheAndReload();
+        } else {
+          this.broadcastHardwareKeys(evt);
+        }
         break;
       case 'sizemodechange':
         if (window.windowState == window.STATE_MINIMIZED && !this.visibleNormalAudioActive) {
@@ -690,24 +773,30 @@ var shell = {
     Cu.import('resource://gre/modules/OperatorApps.jsm');
 #endif
 
-    this.handleCmdLine();
+#ifdef MOZ_GRAPHENE
+    if (Services.prefs.getBoolPref("b2g.nativeWindowGeometry.fullscreen")) {
+      window.fullScreen = true;
+    }
+#endif
+
+    shell.handleCmdLine();
   },
 
-  handleCmdLine: function shell_handleCmdLine() {
+  handleCmdLine: function() {
   // This isn't supported on devices.
 #ifndef ANDROID
     let b2gcmds = Cc["@mozilla.org/commandlinehandler/general-startup;1?type=b2gcmds"]
                     .getService(Ci.nsISupports);
     let args = b2gcmds.wrappedJSObject.cmdLine;
     try {
-      // Returns null if -url is not present
+      // Returns null if -url is not present.
       let url = args.handleFlagWithParam("url", false);
       if (url) {
         this.sendChromeEvent({type: "mozbrowseropenwindow", url});
         args.preventDefault = true;
       }
     } catch(e) {
-      // Throws if -url is present with no params
+      // Throws if -url is present with no params.
     }
 #endif
   },
@@ -843,6 +932,29 @@ var CustomEventManager = {
           evt.preventDefault();
         }
         break;
+      case 'shutdown-application':
+        let appStartup = Cc['@mozilla.org/toolkit/app-startup;1']
+                           .getService(Ci.nsIAppStartup);
+        appStartup.quit(appStartup.eAttemptQuit);
+        break;
+      case 'toggle-fullscreen-native-window':
+        window.fullScreen = !window.fullScreen;
+        Services.prefs.setBoolPref("b2g.nativeWindowGeometry.fullscreen",
+                                   window.fullScreen);
+        break;
+      case 'minimize-native-window':
+        window.minimize();
+        break;
+      case 'clear-cache-and-reload':
+        clearCacheAndReload();
+        break;
+      case 'clear-cache-and-restart':
+        clearCache();
+        restart();
+        break;
+      case 'restart':
+        restart();
+        break;
     }
   }
 }
@@ -1361,3 +1473,64 @@ Services.obs.addObserver(function resetProfile(subject, topic, data) {
                      .getService(Ci.nsIAppStartup);
   appStartup.quit(Ci.nsIAppStartup.eForceQuit);
 }, 'b2g-reset-profile', false);
+
+#ifdef MOZ_GRAPHENE
+
+const restoreWindowGeometry = () => {
+  let screenX = Services.prefs.getIntPref("b2g.nativeWindowGeometry.screenX");
+  let screenY = Services.prefs.getIntPref("b2g.nativeWindowGeometry.screenY");
+  let width = Services.prefs.getIntPref("b2g.nativeWindowGeometry.width");
+  let height = Services.prefs.getIntPref("b2g.nativeWindowGeometry.height");
+
+  if (screenX == -1) {
+    // Center
+    screenX = (screen.width - width) / 2;
+    screenY = (screen.height - height) / 2;
+  }
+
+  moveTo(screenX, screenY);
+  resizeTo(width, height);
+}
+restoreWindowGeometry();
+
+const saveWindowGeometry = () => {
+  window.removeEventListener("unload", saveWindowGeometry);
+  Services.prefs.setIntPref("b2g.nativeWindowGeometry.screenX", screenX);
+  Services.prefs.setIntPref("b2g.nativeWindowGeometry.screenY", screenY);
+  Services.prefs.setIntPref("b2g.nativeWindowGeometry.width", outerWidth);
+  Services.prefs.setIntPref("b2g.nativeWindowGeometry.height", outerHeight);
+}
+window.addEventListener("unload", saveWindowGeometry);
+
+let baseWindow = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIWebNavigation)
+                       .QueryInterface(Ci.nsIDocShellTreeItem)
+                       .treeOwner
+                       .QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIBaseWindow);
+
+const showNativeWindow = () => baseWindow.visibility = true;
+const hideNativeWindow = () => baseWindow.visibility = false;
+
+const showInstallScreen = () => {
+  const grapheneStrings =
+    Services.strings.createBundle('chrome://b2g-l10n/locale/graphene.properties');
+  document.querySelector('#installing > .message').textContent =
+    grapheneStrings.GetStringFromName('installing');
+  showNativeWindow();
+}
+
+const hideInstallScreen = () => {
+  document.body.classList.add('content-loaded');
+}
+
+window.addEventListener('ContentStart', () => {
+  shell.contentBrowser.contentWindow.addEventListener('load', () => {
+    hideInstallScreen();
+    showNativeWindow();
+  });
+});
+
+hideNativeWindow();
+
+#endif
diff --git a/b2g/chrome/jar.mn b/b2g/chrome/jar.mn
index d224a3d8d35..116ad682e68 100644
--- a/b2g/chrome/jar.mn
+++ b/b2g/chrome/jar.mn
@@ -12,9 +12,9 @@ chrome.jar:
 * content/settings.js                   (content/settings.js)
 * content/shell.html                    (content/shell.html)
 * content/shell.js                      (content/shell.js)
-  content/shell.css                     (content/shell.css)
   content/shell_remote.html             (content/shell_remote.html)
   content/shell_remote.js               (content/shell_remote.js)
+* content/shell.css                     (content/shell.css)
   content/blank.html                    (content/blank.html)
   content/blank.css                     (content/blank.css)
 #ifdef MOZ_WIDGET_GONK
@@ -38,7 +38,9 @@ chrome.jar:
 
   content/identity.js                   (content/identity.js)
 
+#ifndef MOZ_GRAPHENE
 % override chrome://global/skin/media/videocontrols.css chrome://b2g/content/touchcontrols.css
+#endif
 % override chrome://global/content/aboutCertError.xhtml chrome://b2g/content/aboutCertError.xhtml
 % override chrome://global/skin/netError.css chrome://b2g/content/netError.css
 
diff --git a/b2g/components/Bootstraper.jsm b/b2g/components/Bootstraper.jsm
index 2465617ddbe..8d9cc4d0888 100644
--- a/b2g/components/Bootstraper.jsm
+++ b/b2g/components/Bootstraper.jsm
@@ -118,6 +118,18 @@ this.Bootstraper = {
     return DOMApplicationRegistry.uninstall(oldManifestURL);
   },
 
+  /**
+   * Check if we are already configured to run from this manifest url.
+   */
+  isInstallRequired: function(aManifestURL) {
+    try {
+      if (Services.prefs.getCharPref("b2g.system_manifest_url") == aManifestURL) {
+        return false;
+      }
+    } catch(e) { }
+    return true;
+  },
+
   /**
     * Resolves once we have installed the app.
     */
@@ -125,14 +137,10 @@ this.Bootstraper = {
     this._manifestURL = aManifestURL;
     debug("Installing app from " + this._manifestURL);
 
-    // Check if we are already configured to run from this manifest url, and
-    // skip reinstall if that's the case.
-    try {
-      if (Services.prefs.getCharPref("b2g.system_manifest_url") == this._manifestURL) {
-        debug("Already configured for " + this._manifestURL);
-        return Promise.resolve();
-      }
-    } catch(e) { }
+    if (!this.isInstallRequired(this._manifestURL)) {
+      debug("Already configured for " + this._manifestURL);
+      return Promise.resolve();
+    }
 
     return new Promise((aResolve, aReject) => {
       DOMApplicationRegistry.registryReady
diff --git a/b2g/graphene/app.mozbuild b/b2g/graphene/app.mozbuild
new file mode 100644
index 00000000000..b891cac42a4
--- /dev/null
+++ b/b2g/graphene/app.mozbuild
@@ -0,0 +1,20 @@
+# 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/.
+
+if not CONFIG['LIBXUL_SDK']:
+    include('/toolkit/toolkit.mozbuild')
+elif CONFIG['ENABLE_TESTS']:
+    DIRS += ['/testing/mochitest']
+
+if CONFIG['MOZ_EXTENSIONS']:
+    DIRS += ['/extensions']
+
+DIRS += [
+    '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
+    '/b2g',
+]
+
+# Add the defaults settings.
+FINAL_TARGET_FILES.defaults += [ 'b2g/graphene/settings.json' ]
diff --git a/b2g/graphene/build.mk b/b2g/graphene/build.mk
new file mode 100644
index 00000000000..5a3623e5afe
--- /dev/null
+++ b/b2g/graphene/build.mk
@@ -0,0 +1,5 @@
+# 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/.
+
+include $(topsrcdir)/b2g/build.mk
diff --git a/b2g/graphene/config/horizon-mozconfigs/common b/b2g/graphene/config/horizon-mozconfigs/common
new file mode 100644
index 00000000000..8ecb51136f8
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/common
@@ -0,0 +1,24 @@
+# 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/.
+
+# Disable the l10n-check target, which isn't relevant to b2g builds at all.
+# This needs to be set prior to the next include for it to take effect.
+MOZ_AUTOMATION_PACKAGE_TESTS=0
+MOZ_AUTOMATION_L10N_CHECK=0
+MOZ_AUTOMATION_SDK=0
+
+. "$topsrcdir/build/mozconfig.common"
+
+# Normally, we'd set this unconditionally, but this file is also used
+# for local builds and there is no other mozconfig in this tree that
+# is included on device builds.
+if test -d $topsrcdir/../gcc/bin; then
+    HOST_CC="$topsrcdir/../gcc/bin/gcc"
+    HOST_CXX="$topsrcdir/../gcc/bin/g++"
+    ac_add_options --enable-stdcxx-compat
+fi
+
+MOZ_HORIZON=1
+ac_add_options --with-branding=b2g/branding/horizon
+ac_add_options --enable-application=b2g/graphene
diff --git a/b2g/graphene/config/horizon-mozconfigs/common.override b/b2g/graphene/config/horizon-mozconfigs/common.override
new file mode 100644
index 00000000000..f17dadfe67f
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/common.override
@@ -0,0 +1,5 @@
+# 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/.
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/linux32/debug b/b2g/graphene/config/horizon-mozconfigs/linux32/debug
new file mode 100644
index 00000000000..0790f5f8b6f
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/linux32/debug
@@ -0,0 +1,28 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
+
+ac_add_options --enable-debug
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+ENABLE_MARIONETTE=1
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/linux32/nightly b/b2g/graphene/config/horizon-mozconfigs/linux32/nightly
new file mode 100644
index 00000000000..01c638472bf
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/linux32/nightly
@@ -0,0 +1,29 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/linux64/debug b/b2g/graphene/config/horizon-mozconfigs/linux64/debug
new file mode 100644
index 00000000000..3780486728c
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/linux64/debug
@@ -0,0 +1,28 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux"
+
+ac_add_options --enable-debug
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+ENABLE_MARIONETTE=1
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/linux64/nightly b/b2g/graphene/config/horizon-mozconfigs/linux64/nightly
new file mode 100644
index 00000000000..bf9c8b86207
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/linux64/nightly
@@ -0,0 +1,29 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/macosx64/debug b/b2g/graphene/config/horizon-mozconfigs/macosx64/debug
new file mode 100644
index 00000000000..4ae8ff5517c
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/macosx64/debug
@@ -0,0 +1,26 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+
+# Use sccache
+no_sccache=
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+#ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# graphene Stuff
+ac_add_options --enable-debug-symbols
+ac_add_options --enable-debug
+ENABLE_MARIONETTE=1
+
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/macosx64/nightly b/b2g/graphene/config/horizon-mozconfigs/macosx64/nightly
new file mode 100644
index 00000000000..fd664c84d01
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/macosx64/nightly
@@ -0,0 +1,27 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+
+# Use sccache
+no_sccache=
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+#ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# graphene Stuff
+ac_add_options --enable-debug-symbols
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/win32/debug b/b2g/graphene/config/horizon-mozconfigs/win32/debug
new file mode 100644
index 00000000000..2c43825b705
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/win32/debug
@@ -0,0 +1,23 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+
+ac_add_options --enable-jemalloc
+ac_add_options --enable-debug
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
+else
+  . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# graphene Options
+ENABLE_MARIONETTE=1
+
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/win32/nightly b/b2g/graphene/config/horizon-mozconfigs/win32/nightly
new file mode 100644
index 00000000000..9005c33bd40
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/win32/nightly
@@ -0,0 +1,23 @@
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-jemalloc
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
+else
+  . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# graphene Options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/win64/debug b/b2g/graphene/config/horizon-mozconfigs/win64/debug
new file mode 100644
index 00000000000..f3a9e99d3ba
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/win64/debug
@@ -0,0 +1,33 @@
+. "$topsrcdir/build/mozconfig.win-common"
+MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+
+ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --host=x86_64-pc-mingw32
+
+ac_add_options --enable-debug
+ac_add_options --enable-dmd
+ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
+ac_add_options --enable-signmar
+
+if [ -f /c/builds/google-oauth-api.key ]; then
+  _google_oauth_api_keyfile=/c/builds/google-oauth-api.key
+else
+  _google_oauth_api_keyfile=/e/builds/google-oauth-api.key
+fi
+ac_add_options --with-google-oauth-api-keyfile=${_google_oauth_api_keyfile}
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. $topsrcdir/build/win64/mozconfig.vs2013
+
+. "$topsrcdir/build/mozconfig.cache"
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/horizon-mozconfigs/win64/nightly b/b2g/graphene/config/horizon-mozconfigs/win64/nightly
new file mode 100644
index 00000000000..4fa2c696934
--- /dev/null
+++ b/b2g/graphene/config/horizon-mozconfigs/win64/nightly
@@ -0,0 +1,27 @@
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common"
+
+ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --host=x86_64-pc-mingw32
+
+. $topsrcdir/build/win64/mozconfig.vs2013
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-jemalloc
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# graphene Options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/horizon-mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/common b/b2g/graphene/config/mozconfigs/common
new file mode 100644
index 00000000000..1cfb7b06b4d
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/common
@@ -0,0 +1,24 @@
+# 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/.
+
+# Disable the l10n-check target, which isn't relevant to b2g builds at all.
+# This needs to be set prior to the next include for it to take effect.
+MOZ_AUTOMATION_PACKAGE_TESTS=0
+MOZ_AUTOMATION_L10N_CHECK=0
+MOZ_AUTOMATION_SDK=0
+
+. "$topsrcdir/build/mozconfig.common"
+
+# Normally, we'd set this unconditionally, but this file is also used
+# for local builds and there is no other mozconfig in this tree that
+# is included on device builds.
+if test -d $topsrcdir/../gcc/bin; then
+    HOST_CC="$topsrcdir/../gcc/bin/gcc"
+    HOST_CXX="$topsrcdir/../gcc/bin/g++"
+    ac_add_options --enable-stdcxx-compat
+fi
+
+ac_add_options --with-branding=b2g/branding/browserhtml
+ac_add_options --enable-application=b2g/graphene
+
diff --git a/b2g/graphene/config/mozconfigs/common.override b/b2g/graphene/config/mozconfigs/common.override
new file mode 100644
index 00000000000..f17dadfe67f
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/common.override
@@ -0,0 +1,5 @@
+# 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/.
+
+. "$topsrcdir/build/mozconfig.common.override"
diff --git a/b2g/graphene/config/mozconfigs/linux32/debug b/b2g/graphene/config/mozconfigs/linux32/debug
new file mode 100644
index 00000000000..c156b93685c
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/linux32/debug
@@ -0,0 +1,28 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
+
+ac_add_options --enable-debug
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+ENABLE_MARIONETTE=1
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/linux32/nightly b/b2g/graphene/config/mozconfigs/linux32/nightly
new file mode 100644
index 00000000000..36ea5195da6
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/linux32/nightly
@@ -0,0 +1,29 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux32"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/linux64/debug b/b2g/graphene/config/mozconfigs/linux64/debug
new file mode 100644
index 00000000000..4edd11359d6
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/linux64/debug
@@ -0,0 +1,28 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux"
+
+ac_add_options --enable-debug
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+ENABLE_MARIONETTE=1
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/linux64/nightly b/b2g/graphene/config/mozconfigs/linux64/nightly
new file mode 100644
index 00000000000..811ecd7c06e
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/linux64/nightly
@@ -0,0 +1,29 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+. "$topsrcdir/build/unix/mozconfig.linux"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+#ac_add_options --enable-js-diagnostics
+
+# This will overwrite the default of stripping everything and keep the symbol table.
+# This is useful for profiling and debugging and only increases the package size
+# by 2 MBs.
+STRIP_FLAGS="--strip-debug"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Use sccache
+no_sccache=
+. "$topsrcdir/build/mozconfig.cache"
+
+# graphene options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/macosx64/debug b/b2g/graphene/config/mozconfigs/macosx64/debug
new file mode 100644
index 00000000000..c4fa9a4290a
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/macosx64/debug
@@ -0,0 +1,26 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+
+# Use sccache
+no_sccache=
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+#ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# graphene Stuff
+ac_add_options --enable-debug-symbols
+ac_add_options --enable-debug
+ENABLE_MARIONETTE=1
+
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/macosx64/nightly b/b2g/graphene/config/mozconfigs/macosx64/nightly
new file mode 100644
index 00000000000..35b165654dd
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/macosx64/nightly
@@ -0,0 +1,27 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+
+# Use sccache
+no_sccache=
+
+. $topsrcdir/build/macosx/mozconfig.common
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+#ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# graphene Stuff
+ac_add_options --enable-debug-symbols
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/win32/debug b/b2g/graphene/config/mozconfigs/win32/debug
new file mode 100644
index 00000000000..37a4e906b92
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/win32/debug
@@ -0,0 +1,23 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+
+ac_add_options --enable-jemalloc
+ac_add_options --enable-debug
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
+else
+  . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# graphene Options
+ENABLE_MARIONETTE=1
+
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/grapheneconfig/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/win32/nightly b/b2g/graphene/config/mozconfigs/win32/nightly
new file mode 100644
index 00000000000..86acbcd95d6
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/win32/nightly
@@ -0,0 +1,23 @@
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-jemalloc
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
+else
+  . $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
+# graphene Options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/win64/debug b/b2g/graphene/config/mozconfigs/win64/debug
new file mode 100644
index 00000000000..5ccd6f844ee
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/win64/debug
@@ -0,0 +1,33 @@
+. "$topsrcdir/build/mozconfig.win-common"
+MOZ_AUTOMATION_L10N_CHECK=0
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+
+ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --host=x86_64-pc-mingw32
+
+ac_add_options --enable-debug
+ac_add_options --enable-dmd
+ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
+ac_add_options --enable-signmar
+
+if [ -f /c/builds/google-oauth-api.key ]; then
+  _google_oauth_api_keyfile=/c/builds/google-oauth-api.key
+else
+  _google_oauth_api_keyfile=/e/builds/google-oauth-api.key
+fi
+ac_add_options --with-google-oauth-api-keyfile=${_google_oauth_api_keyfile}
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+. $topsrcdir/build/win64/mozconfig.vs2013
+
+. "$topsrcdir/build/mozconfig.cache"
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/config/mozconfigs/win64/nightly b/b2g/graphene/config/mozconfigs/win64/nightly
new file mode 100644
index 00000000000..9ff32b4794d
--- /dev/null
+++ b/b2g/graphene/config/mozconfigs/win64/nightly
@@ -0,0 +1,27 @@
+if [ "x$IS_NIGHTLY" = "xyes" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common"
+
+ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --host=x86_64-pc-mingw32
+
+. $topsrcdir/build/win64/mozconfig.vs2013
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-jemalloc
+ac_add_options --enable-signmar
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# graphene Options
+export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
+
+. "$topsrcdir/b2g/graphene/config/mozconfigs/common.override"
diff --git a/b2g/graphene/confvars.sh b/b2g/graphene/confvars.sh
new file mode 100644
index 00000000000..665d1768ad7
--- /dev/null
+++ b/b2g/graphene/confvars.sh
@@ -0,0 +1,65 @@
+# 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/.
+
+if test "$MOZ_HORIZON"; then
+MOZ_APP_BASENAME=Horizon
+else
+MOZ_APP_BASENAME=Graphene
+fi
+
+MOZ_APP_VENDOR=Mozilla
+MOZ_UPDATER=1
+
+MOZ_B2G=1
+MOZ_GRAPHENE=1
+
+MOZ_APP_VERSION=$FIREFOX_VERSION
+MOZ_APP_UA_NAME=Firefox
+
+MOZ_B2G_VERSION=3.0.0.0-prerelease
+MOZ_B2G_OS_NAME=Boot2Gecko
+
+MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
+MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
+# MOZ_APP_DISPLAYNAME is set by branding/configure.sh
+
+MOZ_SAFE_BROWSING=1
+MOZ_SERVICES_COMMON=1
+MOZ_SERVICES_METRICS=1
+MOZ_CAPTIVEDETECT=1
+
+MOZ_WEBSMS_BACKEND=1
+MOZ_NO_SMART_CARDS=1
+MOZ_APP_STATIC_INI=1
+NSS_NO_LIBPKIX=1
+NSS_DISABLE_DBM=1
+MOZ_DISABLE_EXPORT_JS=1
+
+if test "$OS_TARGET" = "Android"; then
+MOZ_CAPTURE=1
+MOZ_RAW=1
+MOZ_AUDIO_CHANNEL_MANAGER=1
+fi
+
+MOZ_MEDIA_NAVIGATOR=1
+
+MOZ_APP_ID={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
+MOZ_TIME_MANAGER=1
+
+MOZ_PAY=1
+MOZ_TOOLKIT_SEARCH=
+MOZ_PLACES=
+MOZ_B2G=1
+
+if test "$OS_TARGET" = "Android"; then
+MOZ_NUWA_PROCESS=1
+MOZ_B2G_LOADER=1
+MOZ_ENABLE_WARNINGS_AS_ERRORS=1
+fi
+
+MOZ_JSDOWNLOADS=1
+
+MOZ_BUNDLED_FONTS=1
+
+export JS_GC_SMALL_CHUNK_SIZE=1
diff --git a/b2g/graphene/graphene.js b/b2g/graphene/graphene.js
new file mode 100644
index 00000000000..53dccc9772a
--- /dev/null
+++ b/b2g/graphene/graphene.js
@@ -0,0 +1,57 @@
+// See http://mxr.mozilla.org/mozilla-central/source/dom/webidl/KeyEvent.webidl
+// for keyCode values.
+// Default value is F5
+pref("b2g.reload_key", '{ "key": 116, "shift": false, "ctrl": false, "alt": false, "meta": false }');
+
+#ifdef MOZ_HORIZON
+pref("b2g.default.start_manifest_url", "https://mozvr.github.io/horizon/web/manifest.webapp");
+pref("dom.vr.enabled", true);
+pref("dom.ipc.tabs.disabled", true);
+#else
+pref("b2g.default.start_manifest_url", "https://mozilla.github.io/browser.html/manifest.webapp");
+pref("dom.ipc.tabs.disabled", false);
+#endif
+
+pref("javascript.options.discardSystemSource", false);
+pref("browser.dom.window.dump.enabled", true);
+pref("browser.ignoreNativeFrameTextSelection", false);
+pref("dom.meta-viewport.enabled", false);
+pref("full-screen-api.ignore-widgets", false);
+pref("image.high_quality_downscaling.enabled", true);
+pref("dom.w3c_touch_events.enabled", 0);
+pref("font.size.inflation.minTwips", 0);
+pref("browser.enable_click_image_resizing", true);
+pref("layout.css.scroll-snap.enabled", true);
+pref("dom.mozInputMethod.enabled", false);
+pref("browser.autofocus", true);
+pref("layers.async-pan-zoom.enabled", false);
+pref("network.predictor.enabled", true);
+
+// Not touch caret
+pref("layout.accessiblecaret.enabled", false);
+pref("selectioncaret.enabled", false);
+pref("touchcaret.enabled", false);
+
+pref("gfx.vsync.hw-vsync.enabled", true);
+pref("gfx.vsync.compositor", true);
+
+// To be removed once bug 942756 is fixed.
+pref("devtools.debugger.unix-domain-socket", "6000");
+
+pref("devtools.debugger.forbid-certified-apps", false);
+pref("devtools.debugger.prompt-connection", false);
+
+// Update url.
+pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
+
+pref("b2g.nativeWindowGeometry.width", 700);
+pref("b2g.nativeWindowGeometry.height", 600);
+pref("b2g.nativeWindowGeometry.screenX", -1); // center
+pref("b2g.nativeWindowGeometry.screenY", -1); // center
+pref("b2g.nativeWindowGeometry.fullscreen", false);
+
+pref("media.useAudioChannelService", false);
+
+#ifdef ENABLE_MARIONETTE
+pref("b2g.is_mulet", true);
+#endif
diff --git a/b2g/graphene/settings.json b/b2g/graphene/settings.json
new file mode 100644
index 00000000000..75bd243a43a
--- /dev/null
+++ b/b2g/graphene/settings.json
@@ -0,0 +1,3 @@
+{
+  "apz.overscroll.enabled": false
+}
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index d125c22875a..9a339cd711a 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -12,19 +12,6 @@
 ; ; file comment
 ;
 
-; Due to Apple Mac OS X packaging requirements, files that are in the same
-; directory on other platforms must be located in different directories on
-; Mac OS X. The following defines allow specifying the Mac OS X bundle
-; location which also work on other platforms.
-;
-; @BINPATH@
-; Equals Contents/MacOS/ on Mac OS X and is the path to the main binary on other
-; platforms.
-;
-; @RESPATH@
-; Equals Contents/Resources/ on Mac OS X and is equivalent to @BINPATH@ on other
-; platforms.
-
 #filter substitution
 
 #ifdef XP_MACOSX
@@ -142,6 +129,7 @@
 @BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
 @RESPATH@/blocklist.xml
 @RESPATH@/ua-update.json
+@RESPATH@/defaults/settings.json
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 @RESPATH@/run-mozilla.sh
diff --git a/b2g/locales/en-US/chrome/graphene.properties b/b2g/locales/en-US/chrome/graphene.properties
new file mode 100644
index 00000000000..be5f0b5c590
--- /dev/null
+++ b/b2g/locales/en-US/chrome/graphene.properties
@@ -0,0 +1,5 @@
+# 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/.
+
+installing=Installing…
diff --git a/b2g/locales/jar.mn b/b2g/locales/jar.mn
index 891c791cf12..b5f9ee7d641 100644
--- a/b2g/locales/jar.mn
+++ b/b2g/locales/jar.mn
@@ -11,6 +11,9 @@
 % override chrome://global/locale/appstrings.properties  chrome://b2g-l10n/locale/appstrings.properties
 * locale/@AB_CD@/b2g-l10n/aboutCertError.dtd       (%chrome/overrides/aboutCertError.dtd)
 * locale/@AB_CD@/b2g-l10n/appstrings.properties    (%chrome/overrides/appstrings.properties)
+#ifdef MOZ_GRAPHENE
+  locale/@AB_CD@/b2g-l10n/graphene.properties (%chrome/graphene.properties)
+#endif
 
 
 # overrides for toolkit l10n, also for en-US
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
index dff31a0635d..433a1be2983 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/browser/components/BrowserComponents.manifest
@@ -34,13 +34,14 @@ category command-line-validator b-browser @mozilla.org/browser/clh;1 application
 #   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
+#   graphene:       {d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 #
 # In theory we should do this for all these instructions, but in practice it is
 # sufficient to do it for the app-startup one, and the file is simpler that way.
 
 component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js
 contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc}
-category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js
 #ifndef MOZ_MULET
 contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a}
diff --git a/browser/components/feeds/BrowserFeeds.manifest b/browser/components/feeds/BrowserFeeds.manifest
index cf558af23a6..be0b5297141 100644
--- a/browser/components/feeds/BrowserFeeds.manifest
+++ b/browser/components/feeds/BrowserFeeds.manifest
@@ -7,6 +7,7 @@
 #   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
+#   graphene:       {d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 #
 # In theory we should do this for all these instructions, but in practice it is
 # sufficient to do it for the app-startup one, and the file is simpler that way.
@@ -25,4 +26,4 @@ component {49bb6593-3aff-4eb3-a068-2712c28bd58e} FeedWriter.js
 contract @mozilla.org/browser/feeds/result-writer;1 {49bb6593-3aff-4eb3-a068-2712c28bd58e}
 component {792a7e82-06a0-437c-af63-b2d12e808acc} WebContentConverter.js
 contract @mozilla.org/embeddor.implemented/web-content-handler-registrar;1 {792a7e82-06a0-437c-af63-b2d12e808acc}
-category app-startup WebContentConverter service,@mozilla.org/embeddor.implemented/web-content-handler-registrar;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+category app-startup WebContentConverter service,@mozilla.org/embeddor.implemented/web-content-handler-registrar;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
diff --git a/browser/components/sessionstore/nsSessionStore.manifest b/browser/components/sessionstore/nsSessionStore.manifest
index ce1b3baa00f..dc33efe8c5a 100644
--- a/browser/components/sessionstore/nsSessionStore.manifest
+++ b/browser/components/sessionstore/nsSessionStore.manifest
@@ -7,6 +7,7 @@
 #   browser:        {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
+#   graphene:       {d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 #
 # In theory we should do this for all these instructions, but in practice it is
 # sufficient to do it for the app-startup one, and the file is simpler that way.
@@ -15,4 +16,4 @@ component {5280606b-2510-4fe0-97ef-9b5a22eafe6b} nsSessionStore.js
 contract @mozilla.org/browser/sessionstore;1 {5280606b-2510-4fe0-97ef-9b5a22eafe6b}
 component {ec7a6c20-e081-11da-8ad9-0800200c9a66} nsSessionStartup.js
 contract @mozilla.org/browser/sessionstartup;1 {ec7a6c20-e081-11da-8ad9-0800200c9a66}
-category app-startup nsSessionStartup service,@mozilla.org/browser/sessionstartup;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+category app-startup nsSessionStartup service,@mozilla.org/browser/sessionstartup;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
diff --git a/configure.in b/configure.in
index 918c83d6b9f..97b6ce50918 100644
--- a/configure.in
+++ b/configure.in
@@ -4038,15 +4038,21 @@ browser)
 xulrunner)
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
-b2g)
-  AC_DEFINE(MOZ_B2G)
-  ;;
-b2g/dev)
-  AC_DEFINE(MOZ_B2G)
-  AC_DEFINE(MOZ_MULET)
-  ;;
 esac
 
+if test -n "$MOZ_B2G"; then
+    AC_DEFINE(MOZ_B2G)
+fi
+
+# Graphene is a desktop runtime for running applications with a HTML UI.
+if test -n "$MOZ_GRAPHENE"; then
+    AC_DEFINE(MOZ_GRAPHENE)
+fi
+
+if test -n "$MOZ_MULET"; then
+    AC_DEFINE(MOZ_MULET)
+fi
+
 if test -n "$MOZ_B2GDROID"; then
     AC_DEFINE(MOZ_B2GDROID)
 fi
@@ -7526,6 +7532,16 @@ if test -n "$MOZ_REFLOW_PERF"; then
     AC_DEFINE(MOZ_REFLOW_PERF)
 fi
 
+dnl ========================================================
+dnl = Horizon build options - set default preferences for
+dnl   the horizon project. Horizon is a browser built on
+dnl   top of the graphene runtime.
+dnl ========================================================
+if test -n "$MOZ_HORIZON"; then
+    AC_DEFINE(MOZ_HORIZON)
+fi
+AC_SUBST(MOZ_HORIZON)
+
 dnl ========================================================
 dnl = Offer a way to disable the startup cache
 dnl ========================================================
diff --git a/devtools/server/actors/utils/map-uri-to-addon-id.js b/devtools/server/actors/utils/map-uri-to-addon-id.js
index 32dc4ad3e48..cc315af2795 100644
--- a/devtools/server/actors/utils/map-uri-to-addon-id.js
+++ b/devtools/server/actors/utils/map-uri-to-addon-id.js
@@ -30,17 +30,19 @@ Object.defineProperty(this, "addonManager", {
 });
 
 const B2G_ID = "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}";
+const GRAPHENE_ID = "{d1bfe7d9-c01e-4237-998b-7b5f960a4314}";
 
 /**
  * This is a wrapper around amIAddonManager.mapURIToAddonID which always returns
- * false on B2G to avoid loading the add-on manager there and reports any
- * exceptions rather than throwing so that the caller doesn't have to worry
- * about them.
+ * false on B2G and graphene to avoid loading the add-on manager there and
+ * reports any exceptions rather than throwing so that the caller doesn't have
+ * to worry about them.
  */
 module.exports = function mapURIToAddonID(uri, id) {
   if (!Services.appinfo
       || Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT
       || Services.appinfo.ID == B2G_ID
+      || Services.appinfo.ID == GRAPHENE_ID
       || !uri
       || !addonManager) {
     return false;
diff --git a/devtools/server/actors/webapps.js b/devtools/server/actors/webapps.js
index e9a050b2033..7b3d84401ea 100644
--- a/devtools/server/actors/webapps.js
+++ b/devtools/server/actors/webapps.js
@@ -874,7 +874,8 @@ WebappsActor.prototype = {
     let deferred = promise.defer();
 
     if (Services.appinfo.ID &&
-        Services.appinfo.ID != "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}") {
+        Services.appinfo.ID != "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}" &&
+        Services.appinfo.ID != "{d1bfe7d9-c01e-4237-998b-7b5f960a4314}") {
       return { error: "notSupported",
                message: "Not B2G. Can't launch app." };
     }
diff --git a/services/datareporting/DataReporting.manifest b/services/datareporting/DataReporting.manifest
index 9feb40b31b8..327ac6ca032 100644
--- a/services/datareporting/DataReporting.manifest
+++ b/services/datareporting/DataReporting.manifest
@@ -3,6 +3,7 @@
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
 #   suite (comm):   {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+#   graphene:       {d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 
 # The Data Reporting Service drives collection and submission of metrics
 # and other useful data to Mozilla. It drives the display of the data
@@ -11,5 +12,5 @@
 
 component {41f6ae36-a79f-4613-9ac3-915e70f83789} DataReportingService.js
 contract @mozilla.org/datareporting/service;1 {41f6ae36-a79f-4613-9ac3-915e70f83789}
-category app-startup DataReportingService service,@mozilla.org/datareporting/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+category app-startup DataReportingService service,@mozilla.org/datareporting/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 
diff --git a/services/sync/SyncComponents.manifest b/services/sync/SyncComponents.manifest
index d635f6a3c63..5a5c8a328f8 100644
--- a/services/sync/SyncComponents.manifest
+++ b/services/sync/SyncComponents.manifest
@@ -8,6 +8,7 @@
 #   mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110}
 #   mobile/xul:     {a23983c0-fd0e-11dc-95ff-0800200c9a66}
 #   suite (comm):   {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+#   graphene:       {d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 #
 # In theory we should do this for all these instructions, but in practice it is
 # sufficient to do it for the app-startup one, and the file is simpler that way.
@@ -15,7 +16,7 @@
 # Weave.js
 component {74b89fb0-f200-4ae8-a3ec-dd164117f6de} Weave.js
 contract @mozilla.org/weave/service;1 {74b89fb0-f200-4ae8-a3ec-dd164117f6de}
-category app-startup WeaveService service,@mozilla.org/weave/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
+category app-startup WeaveService service,@mozilla.org/weave/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={99bceaaa-e3c6-48c1-b981-ef9b46b67d60} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314}
 component {d28f8a0b-95da-48f4-b712-caf37097be41} Weave.js
 contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4-b712-caf37097be41}
 
diff --git a/toolkit/devtools/server/actors/webapps.js b/toolkit/devtools/server/actors/webapps.js
new file mode 100644
index 00000000000..0008892b842
--- /dev/null
+++ b/toolkit/devtools/server/actors/webapps.js
@@ -0,0 +1,1112 @@
+/* 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/. */
+
+"use strict";
+
+let {Cu, Cc, Ci} = require("chrome");
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/osfile.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/UserCustomizations.jsm");
+
+let promise = require("promise");
+let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
+let { ActorPool } = require("devtools/server/actors/common");
+let { DebuggerServer } = require("devtools/server/main");
+let Services = require("Services");
+
+// Comma separated list of permissions that a sideloaded app can't ask for
+const UNSAFE_PERMISSIONS = Services.prefs.getCharPref("devtools.apps.forbidden-permissions");
+
+let FramesMock = null;
+
+exports.setFramesMock = function (mock) {
+  FramesMock = mock;
+};
+
+DevToolsUtils.defineLazyGetter(this, "Frames", () => {
+  // Offer a way for unit test to provide a mock
+  if (FramesMock) {
+    return FramesMock;
+  }
+  try {
+    return Cu.import("resource://gre/modules/Frames.jsm", {}).Frames;
+  } catch(e) {}
+  return null;
+});
+
+function debug(aMsg) {
+  /*
+  Cc["@mozilla.org/consoleservice;1"]
+    .getService(Ci.nsIConsoleService)
+    .logStringMessage("--*-- WebappsActor : " + aMsg);
+  */
+}
+
+function PackageUploadActor(file) {
+  this._file = file;
+  this._path = file.path;
+}
+
+PackageUploadActor.fromRequest = function(request, file) {
+  if (request.bulk) {
+    return new PackageUploadBulkActor(file);
+  }
+  return new PackageUploadJSONActor(file);
+};
+
+PackageUploadActor.prototype = {
+
+  /**
+   * This method isn't exposed to the client.
+   * It is meant to be called by server code, in order to get
+   * access to the temporary file out of the actor ID.
+   */
+  get filePath() {
+    return this._path;
+  },
+
+  get openedFile() {
+    if (this._openedFile) {
+      return this._openedFile;
+    }
+    this._openedFile = this._openFile();
+    return this._openedFile;
+  },
+
+  /**
+   * This method allows you to delete the temporary file,
+   * when you are done using it.
+   */
+  remove: function () {
+    this._cleanupFile();
+    return {};
+  },
+
+  _cleanupFile: function () {
+    try {
+      this._closeFile();
+    } catch(e) {}
+    try {
+      OS.File.remove(this._path);
+    } catch(e) {}
+  }
+
+};
+
+/**
+ * Create a new JSON package upload actor.
+ * @param file nsIFile temporary file to write to
+ */
+function PackageUploadJSONActor(file) {
+  PackageUploadActor.call(this, file);
+  this._size = 0;
+}
+
+PackageUploadJSONActor.prototype = Object.create(PackageUploadActor.prototype);
+
+PackageUploadJSONActor.prototype.actorPrefix = "packageUploadJSONActor";
+
+PackageUploadJSONActor.prototype._openFile = function() {
+  return OS.File.open(this._path, { write: true, truncate: true });
+};
+
+PackageUploadJSONActor.prototype._closeFile = function() {
+  this.openedFile.then(file => file.close());
+};
+
+/**
+ * This method allows you to upload a piece of file.
+ * It expects a chunk argument that is the a string to write to the file.
+ */
+PackageUploadJSONActor.prototype.chunk = function(aRequest) {
+  let chunk = aRequest.chunk;
+  if (!chunk || chunk.length <= 0) {
+    return {error: "parameterError",
+            message: "Missing or invalid chunk argument"};
+  }
+  // Translate the string used to transfer the chunk over JSON
+  // back to a typed array
+  let data = new Uint8Array(chunk.length);
+  for (let i = 0, l = chunk.length; i < l ; i++) {
+    data[i] = chunk.charCodeAt(i);
+  }
+  return this.openedFile
+             .then(file => file.write(data))
+             .then((written) => {
+               this._size += written;
+               return {
+                 written: written,
+                 _size: this._size
+               };
+             });
+};
+
+/**
+ * This method needs to be called, when you are done uploading
+ * chunks, before trying to access/use the temporary file.
+ * Otherwise, the file may be partially written
+ * and also be locked.
+ */
+PackageUploadJSONActor.prototype.done = function() {
+  this._closeFile();
+  return {};
+};
+
+/**
+ * The request types this actor can handle.
+ */
+PackageUploadJSONActor.prototype.requestTypes = {
+  "chunk": PackageUploadJSONActor.prototype.chunk,
+  "done": PackageUploadJSONActor.prototype.done,
+  "remove": PackageUploadJSONActor.prototype.remove
+};
+
+/**
+ * Create a new bulk package upload actor.
+ * @param file nsIFile temporary file to write to
+ */
+function PackageUploadBulkActor(file) {
+  PackageUploadActor.call(this, file);
+}
+
+PackageUploadBulkActor.prototype = Object.create(PackageUploadActor.prototype);
+
+PackageUploadBulkActor.prototype.actorPrefix = "packageUploadBulkActor";
+
+PackageUploadBulkActor.prototype._openFile = function() {
+  return FileUtils.openSafeFileOutputStream(this._file);
+};
+
+PackageUploadBulkActor.prototype._closeFile = function() {
+  FileUtils.closeSafeFileOutputStream(this.openedFile);
+};
+
+PackageUploadBulkActor.prototype.stream = function({copyTo}) {
+  return copyTo(this.openedFile).then(() => {
+    this._closeFile();
+    return {};
+  });
+};
+
+/**
+ * The request types this actor can handle.
+ */
+PackageUploadBulkActor.prototype.requestTypes = {
+  "stream": PackageUploadBulkActor.prototype.stream,
+  "remove": PackageUploadBulkActor.prototype.remove
+};
+
+/**
+ * Creates a WebappsActor. WebappsActor provides remote access to
+ * install apps.
+ */
+function WebappsActor(aConnection) {
+  debug("init");
+  // Load actor dependencies lazily as this actor require extra environnement
+  // preparation to work (like have a profile setup in xpcshell tests)
+
+  Cu.import("resource://gre/modules/Webapps.jsm");
+  Cu.import("resource://gre/modules/AppsUtils.jsm");
+  Cu.import("resource://gre/modules/FileUtils.jsm");
+  Cu.import("resource://gre/modules/MessageBroadcaster.jsm");
+
+  this.appsChild = {};
+  Cu.import("resource://gre/modules/AppsServiceChild.jsm", this.appsChild);
+
+  // Keep reference of already connected app processes.
+  // values: app frame message manager
+  this._connectedApps = new Set();
+
+  this.conn = aConnection;
+  this._uploads = [];
+  this._actorPool = new ActorPool(this.conn);
+  this.conn.addActorPool(this._actorPool);
+}
+
+WebappsActor.prototype = {
+  actorPrefix: "webapps",
+
+  disconnect: function () {
+    try {
+      this.unwatchApps();
+    } catch(e) {}
+
+    // When we stop using this actor, we should ensure removing all files.
+    for (let upload of this._uploads) {
+      upload.remove();
+    }
+    this._uploads = null;
+
+    this.conn.removeActorPool(this._actorPool);
+    this._actorPool = null;
+    this.conn = null;
+  },
+
+  _registerApp: function wa_actorRegisterApp(aDeferred, aApp, aId, aDir) {
+    debug("registerApp");
+    let reg = DOMApplicationRegistry;
+    let self = this;
+
+    if (aId in reg.webapps && !reg.webapps[aId].sideloaded &&
+        !this._isUnrestrictedAccessAllowed()) {
+      throw new Error("Replacing non-sideloaded apps is not permitted.");
+    }
+
+    // Clean up the deprecated manifest cache if needed.
+    if (aId in reg._manifestCache) {
+      delete reg._manifestCache[aId];
+    }
+
+    aApp.installTime = Date.now();
+    aApp.installState = "installed";
+    aApp.removable = true;
+    aApp.id = aId;
+    aApp.basePath = reg.getWebAppsBasePath();
+    aApp.localId = (aId in reg.webapps) ? reg.webapps[aId].localId
+                                        : reg._nextLocalId();
+    aApp.sideloaded = true;
+
+    reg.webapps[aId] = aApp;
+    reg.updatePermissionsForApp(aId);
+
+    reg._readManifests([{ id: aId }]).then((aResult) => {
+      let manifest = aResult[0].manifest;
+      aApp.name = manifest.name;
+      aApp.csp = manifest.csp || "";
+      aApp.role = manifest.role || "";
+      reg.updateAppHandlers(null, manifest, aApp);
+
+      reg._saveApps().then(() => {
+        aApp.manifest = manifest;
+
+        // We need the manifest to set the app kind for hosted apps,
+        // because of appcache.
+        if (aApp.kind == undefined) {
+          aApp.kind = manifest.appcache_path ? reg.kHostedAppcache
+                                             : reg.kHosted;
+        }
+
+        // Needed to evict manifest cache on content side
+        // (has to be dispatched first, otherwise other messages like
+        // Install:Return:OK are going to use old manifest version)
+        MessageBroadcaster.broadcastMessage("Webapps:UpdateState", {
+          app: aApp,
+          manifest: manifest,
+          id: aApp.id
+        });
+        MessageBroadcaster.broadcastMessage("Webapps:FireEvent", {
+          eventType: ["downloadsuccess", "downloadapplied"],
+          manifestURL: aApp.manifestURL
+        });
+        MessageBroadcaster.broadcastMessage("Webapps:AddApp", { id: aId, app: aApp });
+        MessageBroadcaster.broadcastMessage("Webapps:Install:Return:OK", {
+          app: aApp,
+          oid: "foo",
+          requestID: "bar"
+        });
+
+        Services.obs.notifyObservers(null, "webapps-installed",
+          JSON.stringify({ manifestURL: aApp.manifestURL }));
+
+        delete aApp.manifest;
+        aDeferred.resolve({ appId: aId, path: aDir.path });
+
+        // We can't have appcache for packaged apps.
+        if (!aApp.origin.startsWith("app://")) {
+          reg.startOfflineCacheDownload(
+            new ManifestHelper(manifest, aApp.origin, aApp.manifestURL), aApp);
+        }
+      });
+      // Cleanup by removing the temporary directory.
+      if (aDir.exists())
+        aDir.remove(true);
+    });
+  },
+
+  _sendError: function wa_actorSendError(aDeferred, aMsg, aId) {
+    debug("Sending error: " + aMsg);
+    aDeferred.resolve({
+      error: "installationFailed",
+      message: aMsg,
+      appId: aId
+    });
+  },
+
+  _getAppType: function wa_actorGetAppType(aType) {
+    let type = Ci.nsIPrincipal.APP_STATUS_INSTALLED;
+
+    if (aType) {
+      type = aType == "privileged" ? Ci.nsIPrincipal.APP_STATUS_PRIVILEGED
+           : aType == "certified" ? Ci.nsIPrincipal.APP_STATUS_CERTIFIED
+           : Ci.nsIPrincipal.APP_STATUS_INSTALLED;
+    }
+
+    return type;
+  },
+
+  _createTmpPackage: function() {
+    let tmpDir = FileUtils.getDir("TmpD", ["file-upload"], true, false);
+    if (!tmpDir.exists() || !tmpDir.isDirectory()) {
+      return {
+        error: "fileAccessError",
+        message: "Unable to create temporary folder"
+      };
+    }
+    let tmpFile = tmpDir;
+    tmpFile.append("package.zip");
+    tmpFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("0666", 8));
+    if (!tmpFile.exists() || !tmpDir.isFile()) {
+      return {
+        error: "fileAccessError",
+        message: "Unable to create temporary file"
+      };
+    }
+    return tmpFile;
+  },
+
+  uploadPackage: function (request) {
+    debug("uploadPackage");
+
+    let tmpFile = this._createTmpPackage();
+    if ("error" in tmpFile) {
+      return tmpFile;
+    }
+
+    let actor = PackageUploadActor.fromRequest(request, tmpFile);
+    this._actorPool.addActor(actor);
+    this._uploads.push(actor);
+    return { actor: actor.actorID };
+  },
+
+  installHostedApp: function wa_actorInstallHosted(aDir, aId, aReceipts,
+                                                   aManifest, aMetadata) {
+    debug("installHostedApp");
+    let self = this;
+    let deferred = promise.defer();
+
+    function readManifest() {
+      if (aManifest) {
+        return promise.resolve(aManifest);
+      } else {
+        let manFile = OS.Path.join(aDir.path, "manifest.webapp");
+        return AppsUtils.loadJSONAsync(manFile);
+      }
+    }
+    function writeManifest(resolution) {
+      // Move manifest.webapp to the destination directory.
+      // The destination directory for this app.
+      let installDir = DOMApplicationRegistry._getAppDir(aId);
+      if (aManifest) {
+        let manFile = OS.Path.join(installDir.path, "manifest.webapp");
+        return DOMApplicationRegistry._writeFile(manFile, JSON.stringify(aManifest)).then(() => {
+          return resolution;
+        });
+      } else {
+        let manFile = aDir.clone();
+        manFile.append("manifest.webapp");
+        manFile.moveTo(installDir, "manifest.webapp");
+      }
+      return promise.resolve(resolution);
+    }
+    function readMetadata(aAppType) {
+      if (aMetadata) {
+        return { metadata: aMetadata, appType: aAppType };
+      }
+      // Read the origin and manifest url from metadata.json
+      let metaFile = OS.Path.join(aDir.path, "metadata.json");
+      return AppsUtils.loadJSONAsync(metaFile).then((aMetadata) => {
+        if (!aMetadata) {
+          throw("Error parsing metadata.json.");
+        }
+        if (!aMetadata.origin) {
+          throw("Missing 'origin' property in metadata.json.");
+        }
+        return { metadata: aMetadata, appType: aAppType };
+      });
+    }
+    let runnable = {
+      run: function run() {
+        try {
+          let metadata, appType;
+          readManifest().
+            then(readMetadata).
+            then(function ({ metadata, appType }) {
+              let origin = metadata.origin;
+              let manifestURL = metadata.manifestURL ||
+                                origin + "/manifest.webapp";
+              // Create a fake app object with the minimum set of properties we need.
+              let app = {
+                origin: origin,
+                installOrigin: metadata.installOrigin || origin,
+                manifestURL: manifestURL,
+                appStatus: appType,
+                receipts: aReceipts,
+              };
+
+              return writeManifest(app);
+            }).then(function (app) {
+              self._registerApp(deferred, app, aId, aDir);
+            }, function (error) {
+              self._sendError(deferred, error, aId);
+            });
+        } catch(e) {
+          // If anything goes wrong, just send it back.
+          self._sendError(deferred, e.toString(), aId);
+        }
+      }
+    }
+
+    Services.tm.currentThread.dispatch(runnable,
+                                       Ci.nsIThread.DISPATCH_NORMAL);
+    return deferred.promise;
+  },
+
+  installPackagedApp: function wa_actorInstallPackaged(aDir, aId, aReceipts) {
+    debug("installPackagedApp");
+    let self = this;
+    let deferred = promise.defer();
+
+    let runnable = {
+      run: function run() {
+        try {
+          // Open the app zip package
+          let zipFile = aDir.clone();
+          zipFile.append("application.zip");
+          let zipReader = Cc["@mozilla.org/libjar/zip-reader;1"]
+                            .createInstance(Ci.nsIZipReader);
+          zipReader.open(zipFile);
+
+          // Prefer manifest.webapp when available
+          let hasWebappManifest = zipReader.hasEntry("manifest.webapp");
+          let hasJsonManifest = zipReader.hasEntry("manifest.json");
+
+          if (!hasWebappManifest && !hasJsonManifest) {
+            self._sendError(deferred, "Missing manifest.webapp or manifest.json", aId);
+            return;
+          }
+
+          let manifestName = hasWebappManifest ? "manifest.webapp" : "manifest.json";
+
+          // Read app manifest from `application.zip`
+          let istream = zipReader.getInputStream(manifestName);
+          let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                            .createInstance(Ci.nsIScriptableUnicodeConverter);
+          converter.charset = "UTF-8";
+          let jsonString = converter.ConvertToUnicode(
+            NetUtil.readInputStreamToString(istream, istream.available())
+          );
+          zipReader.close();
+
+          let manifest;
+          try {
+            manifest = JSON.parse(jsonString);
+          } catch(e) {
+            self._sendError(deferred, "Error Parsing " + manifestName + ": " + e, aId);
+            return;
+          }
+
+          if (manifestName === "manifest.json") {
+            if (!UserCustomizations.checkExtensionManifest(manifest)) {
+              self._sendError(deferred, "Invalid manifest", aId);
+              return;
+            }
+            manifest = UserCustomizations.convertManifest(manifest);
+          }
+
+          // Completely forbid pushing apps asking for unsafe permissions
+          if ("permissions" in manifest) {
+            let list = UNSAFE_PERMISSIONS.split(",");
+            let hasOne = list.some(p => p.trim() in manifest.permissions);
+            if (hasOne) {
+              self._sendError(deferred, "Installing apps with any of these " +
+                                        "permissions is forbidden: " +
+                                        UNSAFE_PERMISSIONS, aId);
+              return;
+            }
+          }
+
+          let appType = self._getAppType(manifest.type);
+
+          // Privileged and certified packaged apps can setup a custom origin
+          // via `origin` manifest property
+          let id = aId;
+          if (appType >= Ci.nsIPrincipal.APP_STATUS_PRIVILEGED &&
+              manifest.origin !== undefined) {
+            let uri;
+            try {
+              uri = Services.io.newURI(manifest.origin, null, null);
+            } catch(e) {
+              self._sendError(deferred, "Invalid origin in webapp's manifest", aId);
+            }
+
+            if (uri.scheme != "app") {
+              self._sendError(deferred, "Invalid origin in webapp's manifest", aId);
+            }
+            id = uri.prePath.substring(6);
+          }
+
+          // Prevent overriding preinstalled apps
+          if (id in DOMApplicationRegistry.webapps &&
+              DOMApplicationRegistry.webapps[id].removable === false &&
+              !self._isUnrestrictedAccessAllowed()) {
+            self._sendError(deferred, "The application " + id + " can't be overridden.");
+            return;
+          }
+
+          // Only after security checks are made and after final app id is computed
+          // we can move application.zip to the destination directory, and
+          // write manifest.webapp there.
+          let installDir = DOMApplicationRegistry._getAppDir(id);
+          zipFile.moveTo(installDir, "application.zip");
+
+          let manFile = installDir.clone();
+          manFile.append("manifest.webapp");
+          DOMApplicationRegistry._writeFile(manFile.path, JSON.stringify(manifest))
+            .then(() => {
+              let origin = "app://" + id;
+              let manifestURL = origin + "/manifest.webapp";
+
+              // Refresh application.zip content (e.g. reinstall app), as done here:
+              // http://hg.mozilla.org/mozilla-central/annotate/aaefec5d34f8/dom/apps/src/Webapps.jsm#l1125
+              // Do it in parent process for the simulator
+              let jar = installDir.clone();
+              jar.append("application.zip");
+              Services.obs.notifyObservers(jar, "flush-cache-entry", null);
+
+              // And then in app content process
+              // This function will be evaluated in the scope of the content process
+              // frame script. That will flush the jar cache for this app and allow
+              // loading fresh updated resources if we reload its document.
+              let FlushFrameScript = function (path) {
+                let jar = Cc["@mozilla.org/file/local;1"]
+                            .createInstance(Ci.nsILocalFile);
+                jar.initWithPath(path);
+                let obs = Cc["@mozilla.org/observer-service;1"]
+                            .getService(Ci.nsIObserverService);
+                obs.notifyObservers(jar, "flush-cache-entry", null);
+              };
+              for (let frame of self._appFrames()) {
+                if (frame.getAttribute("mozapp") == manifestURL) {
+                  let mm = frame.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.messageManager;
+                  mm.loadFrameScript("data:," +
+                    encodeURIComponent("(" + FlushFrameScript.toString() + ")" +
+                                       "('" + jar.path + "')"), false);
+                }
+              }
+
+              // Create a fake app object with the minimum set of properties we need.
+              let app = {
+                origin: origin,
+                installOrigin: origin,
+                manifestURL: manifestURL,
+                appStatus: appType,
+                receipts: aReceipts,
+                kind: DOMApplicationRegistry.kPackaged,
+              }
+
+              self._registerApp(deferred, app, id, aDir);
+            });
+        } catch(e) {
+          // If anything goes wrong, just send it back.
+          self._sendError(deferred, e.toString(), aId);
+        }
+      }
+    }
+
+    Services.tm.currentThread.dispatch(runnable,
+                                       Ci.nsIThread.DISPATCH_NORMAL);
+    return deferred.promise;
+  },
+
+  /**
+    * @param appId   : The id of the app we want to install. We will look for
+    *                  the files for the app in $TMP/b2g/$appId :
+    *                  For packaged apps: application.zip
+    *                  For hosted apps:   metadata.json and manifest.webapp
+    */
+  install: function wa_actorInstall(aRequest) {
+    debug("install");
+
+    let appId = aRequest.appId;
+    let reg = DOMApplicationRegistry;
+    if (!appId) {
+      appId = reg.makeAppId();
+    }
+
+    // Check that we are not overriding a preinstalled application.
+    if (appId in reg.webapps &&
+        reg.webapps[appId].removable === false &&
+        !this._isUnrestrictedAccessAllowed()) {
+      return { error: "installationFailed",
+               message: "The application " + appId + " can't be overridden."
+             };
+    }
+
+    let appDir = FileUtils.getDir("TmpD", ["b2g", appId], false, false);
+
+    if (aRequest.upload) {
+      // Ensure creating the directory (recursively)
+      appDir = FileUtils.getDir("TmpD", ["b2g", appId], true, false);
+      let actor = this.conn.getActor(aRequest.upload);
+      if (!actor) {
+        return { error: "badParameter",
+                 message: "Unable to find upload actor '" + aRequest.upload
+                          + "'" };
+      }
+      let appFile = FileUtils.File(actor.filePath);
+      if (!appFile.exists()) {
+        return { error: "badParameter",
+                 message: "The uploaded file doesn't exist on device" };
+      }
+      appFile.moveTo(appDir, "application.zip");
+    } else if ((!appDir || !appDir.exists()) &&
+               !aRequest.manifest && !aRequest.metadata) {
+      return { error: "badParameterType",
+               message: "missing directory " + appDir.path
+             };
+    }
+
+    let testFile = appDir.clone();
+    testFile.append("application.zip");
+
+    let receipts = (aRequest.receipts && Array.isArray(aRequest.receipts))
+                    ? aRequest.receipts
+                    : [];
+
+    if (testFile.exists()) {
+      return this.installPackagedApp(appDir, appId, receipts);
+    }
+
+    let manifest, metadata;
+    let missing =
+      ["manifest.webapp", "metadata.json"]
+      .some(function(aName) {
+        testFile = appDir.clone();
+        testFile.append(aName);
+        return !testFile.exists();
+      });
+    if (missing) {
+      if (aRequest.manifest && aRequest.metadata &&
+          aRequest.metadata.origin) {
+        manifest = aRequest.manifest;
+        metadata = aRequest.metadata;
+      } else {
+        try {
+          appDir.remove(true);
+        } catch(e) {}
+        return { error: "badParameterType",
+                 message: "hosted app file and manifest/metadata fields " +
+                          "are missing"
+        };
+      }
+    }
+
+    return this.installHostedApp(appDir, appId, receipts, manifest, metadata);
+  },
+
+  getAll: function wa_actorGetAll(aRequest) {
+    debug("getAll");
+
+    let deferred = promise.defer();
+    this.appsChild.DOMApplicationRegistry.getAll(apps => {
+      deferred.resolve({ apps: this._filterAllowedApps(apps) });
+    });
+
+    return deferred.promise;
+  },
+
+  getApp: function wa_actorGetApp(aRequest) {
+    debug("getApp");
+
+    let manifestURL = aRequest.manifestURL;
+    if (!manifestURL) {
+      return { error: "missingParameter",
+               message: "missing parameter manifestURL" };
+    }
+
+    let reg = DOMApplicationRegistry;
+    let app = reg.getAppByManifestURL(manifestURL);
+    if (!app) {
+      return { error: "appNotFound" };
+    }
+
+    if (!this._isAppAllowedForURL(app.manifestURL)) {
+      return { error: "forbidden" };
+    }
+
+    return reg.getManifestFor(manifestURL).then(function (manifest) {
+      app.manifest = manifest;
+      return { app: app };
+    });
+  },
+
+  _isUnrestrictedAccessAllowed: function() {
+    let pref = "devtools.debugger.forbid-certified-apps";
+    return !Services.prefs.getBoolPref(pref);
+  },
+
+  _isAppAllowed: function(aApp) {
+    if (this._isUnrestrictedAccessAllowed()) {
+      return true;
+    }
+    return aApp.sideloaded;
+  },
+
+  _filterAllowedApps: function wa__filterAllowedApps(aApps) {
+    return aApps.filter(app => this._isAppAllowed(app));
+  },
+
+  _isAppAllowedForURL: function wa__isAppAllowedForURL(aManifestURL) {
+    let reg = DOMApplicationRegistry;
+    let app = reg.getAppByManifestURL(aManifestURL);
+    return this._isAppAllowed(app);
+  },
+
+  uninstall: function wa_actorUninstall(aRequest) {
+    debug("uninstall");
+
+    let manifestURL = aRequest.manifestURL;
+    if (!manifestURL) {
+      return { error: "missingParameter",
+               message: "missing parameter manifestURL" };
+    }
+
+    if (!this._isAppAllowedForURL(manifestURL)) {
+      return { error: "forbidden" };
+    }
+
+    return DOMApplicationRegistry.uninstall(manifestURL);
+  },
+
+  _findManifestByURL: function wa__findManifestByURL(aManifestURL) {
+    let deferred = promise.defer();
+
+    let reg = DOMApplicationRegistry;
+    let id = reg._appIdForManifestURL(aManifestURL);
+
+    reg._readManifests([{ id: id }]).then((aResults) => {
+      deferred.resolve(aResults[0].manifest);
+    });
+
+    return deferred.promise;
+  },
+
+  getIconAsDataURL: function (aRequest) {
+    debug("getIconAsDataURL");
+
+    let manifestURL = aRequest.manifestURL;
+    if (!manifestURL) {
+      return { error: "missingParameter",
+               message: "missing parameter manifestURL" };
+    }
+
+    let reg = DOMApplicationRegistry;
+    let app = reg.getAppByManifestURL(manifestURL);
+    if (!app) {
+      return { error: "wrongParameter",
+               message: "No application for " + manifestURL };
+    }
+
+    let deferred = promise.defer();
+
+    this._findManifestByURL(manifestURL).then(jsonManifest => {
+      let manifest = new ManifestHelper(jsonManifest, app.origin, manifestURL);
+      let iconURL = manifest.iconURLForSize(aRequest.size || 128);
+      if (!iconURL) {
+        deferred.resolve({
+          error: "noIcon",
+          message: "This app has no icon"
+        });
+        return;
+      }
+
+      // Download the URL as a blob
+      // bug 899177: there is a bug with xhr and app:// and jar:// uris
+      // that ends up forcing the content type to application/xml.
+      let req = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
+                  .createInstance(Ci.nsIXMLHttpRequest);
+      req.open("GET", iconURL, false);
+      req.responseType = "blob";
+
+      try {
+        req.send(null);
+      } catch(e) {
+        deferred.resolve({
+          error: "noIcon",
+          message: "The icon file '" + iconURL + "' doesn't exist"
+        });
+        return;
+      }
+
+      // Convert the blog to a base64 encoded data URI
+      let reader = Cc["@mozilla.org/files/filereader;1"]
+                     .createInstance(Ci.nsIDOMFileReader);
+      reader.onload = function () {
+        deferred.resolve({
+          url: reader.result
+        });
+      };
+      reader.onerror = function () {
+        deferred.resolve({
+          error: reader.error.name,
+          message: String(reader.error)
+        });
+      };
+      reader.readAsDataURL(req.response);
+    });
+
+    return deferred.promise;
+  },
+
+  launch: function wa_actorLaunch(aRequest) {
+    debug("launch");
+
+    let manifestURL = aRequest.manifestURL;
+    if (!manifestURL) {
+      return { error: "missingParameter",
+               message: "missing parameter manifestURL" };
+    }
+
+    let deferred = promise.defer();
+
+    if (Services.appinfo.ID &&
+        Services.appinfo.ID != "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}" &&
+        Services.appinfo.ID != "{d1bfe7d9-c01e-4237-998b-7b5f960a4314}") {
+      return { error: "notSupported",
+               message: "Not B2G. Can't launch app." };
+    }
+
+    DOMApplicationRegistry.launch(
+      aRequest.manifestURL,
+      aRequest.startPoint || "",
+      Date.now(),
+      function onsuccess() {
+        deferred.resolve({});
+      },
+      function onfailure(reason) {
+        deferred.resolve({ error: reason });
+      });
+
+    return deferred.promise;
+  },
+
+  close: function wa_actorLaunch(aRequest) {
+    debug("close");
+
+    let manifestURL = aRequest.manifestURL;
+    if (!manifestURL) {
+      return { error: "missingParameter",
+               message: "missing parameter manifestURL" };
+    }
+
+    let reg = DOMApplicationRegistry;
+    let app = reg.getAppByManifestURL(manifestURL);
+    if (!app) {
+      return { error: "missingParameter",
+               message: "No application for " + manifestURL };
+    }
+
+    reg.close(app);
+
+    return {};
+  },
+
+  _appFrames: function () {
+    // Try to filter on b2g and mulet
+    if (Frames) {
+      return Frames.list().filter(frame => {
+        return frame.getAttribute('mozapp');
+      });
+    } else {
+      return [];
+    }
+  },
+
+  listRunningApps: function (aRequest) {
+    debug("listRunningApps\n");
+
+    let appPromises = [];
+    let apps = [];
+
+    for (let frame of this._appFrames()) {
+      let manifestURL = frame.getAttribute("mozapp");
+
+      // _appFrames can return more than one frame with the same manifest url
+      if (apps.indexOf(manifestURL) != -1) {
+        continue;
+      }
+      if (this._isAppAllowedForURL(manifestURL)) {
+        apps.push(manifestURL);
+      }
+    }
+
+    return { apps: apps };
+  },
+
+  getAppActor: function ({ manifestURL }) {
+    debug("getAppActor\n");
+
+    // Connects to the main app frame, whose `name` attribute
+    // is set to 'main' by gaia. If for any reason, gaia doesn't set any
+    // frame as main, no frame matches, then we connect arbitrary
+    // to the first app frame...
+    let appFrame = null;
+    let frames = [];
+    for (let frame of this._appFrames()) {
+      if (frame.getAttribute("mozapp") == manifestURL) {
+        if (frame.name == "main") {
+          appFrame = frame;
+          break;
+        }
+        frames.push(frame);
+      }
+    }
+    if (!appFrame && frames.length > 0) {
+      appFrame = frames[0];
+    }
+
+    let notFoundError = {
+      error: "appNotFound",
+      message: "Unable to find any opened app whose manifest " +
+               "is '" + manifestURL + "'"
+    };
+
+    if (!appFrame) {
+      return notFoundError;
+    }
+
+    if (!this._isAppAllowedForURL(manifestURL)) {
+      return notFoundError;
+    }
+
+    // Only create a new actor, if we haven't already
+    // instanciated one for this connection.
+    let set = this._connectedApps;
+    let mm = appFrame.QueryInterface(Ci.nsIFrameLoaderOwner)
+                     .frameLoader
+                     .messageManager;
+    if (!set.has(mm)) {
+      let onConnect = actor => {
+        set.add(mm);
+        return { actor: actor };
+      };
+      let onDisconnect = mm => {
+        set.delete(mm);
+      };
+      return DebuggerServer.connectToChild(this.conn, appFrame, onDisconnect)
+                           .then(onConnect);
+    }
+
+    // We have to update the form as it may have changed
+    // if we detached the TabActor
+    let deferred = promise.defer();
+    let onFormUpdate = msg => {
+      mm.removeMessageListener("debug:form", onFormUpdate);
+      deferred.resolve({ actor: msg.json });
+    };
+    mm.addMessageListener("debug:form", onFormUpdate);
+    mm.sendAsyncMessage("debug:form");
+
+    return deferred.promise;
+  },
+
+  watchApps: function () {
+    // For now, app open/close events are only implement on b2g
+    if (Frames) {
+      Frames.addObserver(this);
+    }
+    Services.obs.addObserver(this, "webapps-installed", false);
+    Services.obs.addObserver(this, "webapps-uninstall", false);
+
+    return {};
+  },
+
+  unwatchApps: function () {
+    if (Frames) {
+      Frames.removeObserver(this);
+    }
+    Services.obs.removeObserver(this, "webapps-installed", false);
+    Services.obs.removeObserver(this, "webapps-uninstall", false);
+
+    return {};
+  },
+
+  onFrameCreated: function (frame, isFirstAppFrame) {
+    let mozapp = frame.getAttribute('mozapp');
+    if (!mozapp || !isFirstAppFrame) {
+      return;
+    }
+
+    let manifestURL = frame.appManifestURL;
+    // Only track app frames
+    if (!manifestURL) {
+      return;
+    }
+
+    if (this._isAppAllowedForURL(manifestURL)) {
+      this.conn.send({ from: this.actorID,
+                       type: "appOpen",
+                       manifestURL: manifestURL
+                     });
+    }
+  },
+
+  onFrameDestroyed: function (frame, isLastAppFrame) {
+    let mozapp = frame.getAttribute('mozapp');
+    if (!mozapp || !isLastAppFrame) {
+      return;
+    }
+
+    let manifestURL = frame.appManifestURL;
+    // Only track app frames
+    if (!manifestURL) {
+      return;
+    }
+
+    if (this._isAppAllowedForURL(manifestURL)) {
+      this.conn.send({ from: this.actorID,
+                       type: "appClose",
+                       manifestURL: manifestURL
+                     });
+    }
+  },
+
+  observe: function (subject, topic, data) {
+    let app = JSON.parse(data);
+    if (topic == "webapps-installed") {
+      this.conn.send({ from: this.actorID,
+                       type: "appInstall",
+                       manifestURL: app.manifestURL
+                     });
+    } else if (topic == "webapps-uninstall") {
+      this.conn.send({ from: this.actorID,
+                       type: "appUninstall",
+                       manifestURL: app.manifestURL
+                     });
+    }
+  }
+};
+
+/**
+ * The request types this actor can handle.
+ */
+WebappsActor.prototype.requestTypes = {
+  "install": WebappsActor.prototype.install,
+  "uploadPackage": WebappsActor.prototype.uploadPackage,
+  "getAll": WebappsActor.prototype.getAll,
+  "getApp": WebappsActor.prototype.getApp,
+  "launch": WebappsActor.prototype.launch,
+  "close": WebappsActor.prototype.close,
+  "uninstall": WebappsActor.prototype.uninstall,
+  "listRunningApps": WebappsActor.prototype.listRunningApps,
+  "getAppActor": WebappsActor.prototype.getAppActor,
+  "watchApps": WebappsActor.prototype.watchApps,
+  "unwatchApps": WebappsActor.prototype.unwatchApps,
+  "getIconAsDataURL": WebappsActor.prototype.getIconAsDataURL
+};
+
+exports.WebappsActor = WebappsActor;