Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 797613 - identify Fennec via MOZ_FENNEC var and use MOZ_B2G to simplify Webapps.js ifdefs; r=fabrice, khuey

Browse Source 
--HG--
extra : rebase_source : d6f223797f3acad6d06ec035aaf3b7edf50cb0a0
This commit is contained in:
Myk Melez 2013-02-01 15:47:24 -08:00
parent 216b800725
commit 9f1f3e0446
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom/apps/src/Webapps.js
View File

@ -263,17 +263,7 @@ WebappsRegistry.prototype = {
classID: Components.ID("{fff440b3-fae2-45c1-bf03-3b5a2e432270}"),
QueryInterface: XPCOMUtils.generateQI([Ci.mozIDOMApplicationRegistry,
#ifdef MOZ_PHOENIX
# Firefox Desktop: installPackage not implemented
#elifdef ANDROID
#ifndef MOZ_WIDGET_GONK
# Firefox Android (Fennec): installPackage not implemented
#else
# B2G Gonk: installPackage implemented
Ci.mozIDOMApplicationRegistry2,
#endif
#else
# B2G Desktop and others: installPackage implementation status varies
#ifdef MOZ_B2G
Ci.mozIDOMApplicationRegistry2,
#endif
Ci.nsIDOMGlobalPropertyInitializer]),
@ -281,17 +271,7 @@ WebappsRegistry.prototype = {
classInfo: XPCOMUtils.generateCI({classID: Components.ID("{fff440b3-fae2-45c1-bf03-3b5a2e432270}"),
contractID: "@mozilla.org/webapps;1",
interfaces: [Ci.mozIDOMApplicationRegistry,
#ifdef MOZ_PHOENIX
# Firefox Desktop: installPackage not implemented
#elifdef ANDROID
#ifndef MOZ_WIDGET_GONK
# Firefox Android (Fennec): installPackage not implemented
#else
# B2G Gonk: installPackage implemented
Ci.mozIDOMApplicationRegistry2,
#endif
#else
# B2G Desktop and others: installPackage implementation status varies
#ifdef MOZ_B2G
Ci.mozIDOMApplicationRegistry2,
#endif
],

2
mobile/android/confvars.sh
View File

@ -45,3 +45,5 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
MOZ_ANDROID_OMTC=1
MOZ_EXTENSION_MANAGER=1
MOZ_APP_STATIC_INI=1
MOZ_FENNEC=1