Bug 697006 - Add desktop support for the Open Web Apps API - Part 1 : enable mozApps on desktop [r=gavin]

browser/installer/package-manifest.in

@@ -144,6 +144,7 @@
 @BINPATH@/components/directory.xpt
 @BINPATH@/components/docshell.xpt
 @BINPATH@/components/dom.xpt
+@BINPATH@/components/dom_apps.xpt
 @BINPATH@/components/dom_base.xpt
 #ifdef MOZ_B2G_RIL
 @BINPATH@/components/dom_telephony.xpt
@@ -410,6 +411,8 @@
 @BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/messageWakeupService.js
 @BINPATH@/components/messageWakeupService.manifest
+@BINPATH@/components/Webapps.js
+@BINPATH@/components/Webapps.manifest
 
 @BINPATH@/components/ContactManager.js
 @BINPATH@/components/ContactManager.manifest

dom/Makefile.in

@@ -69,11 +69,9 @@ DIRS = \
   interfaces/smil \
   $(NULL)
 
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 DIRS += \
   interfaces/apps \
   $(NULL)
-endif
 
 DIRS += \
   base \

dom/base/Makefile.in

@@ -59,7 +59,6 @@ EXTRA_PP_COMPONENTS = \
 EXTRA_JS_MODULES = ConsoleAPIStorage.jsm \
 		$(NULL)
 
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_COMPONENTS = \
 	        Webapps.js \
 	        Webapps.manifest \
@@ -67,7 +66,6 @@ EXTRA_COMPONENTS = \
 
 EXTRA_JS_MODULES += Webapps.jsm \
 		$(NULL)
-endif
 
 EXTRA_JS_MODULES += DOMRequestHelper.jsm \
 		$(NULL)