Bug 774216. Can't launch apps on B2G since it's seen as XP_UNIX by We…

…bappOSUtils. r=felipe
Brli · Jul 16, 2012 · be4959b · be4959b
1 parent b436e62
commit be4959b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/browser/modules/webappsUI.jsm b/browser/modules/webappsUI.jsm
@@ -12,6 +12,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
 Cu.import("resource:///modules/WebappsInstaller.jsm");
+Cu.import("resource://gre/modules/WebappOSUtils.jsm");
 
 let webappsUI = {
   init: function webappsUI_init() {
@@ -34,12 +35,7 @@ let webappsUI = {
           this.doInstall(data, browser, chromeWin);
         break;
       case "webapps-launch":
-        DOMApplicationRegistry.getManifestFor(data.origin, (function(aManifest) {
-          if (!aManifest)
-            return;
-          let manifest = new DOMApplicationManifest(aManifest, data.origin);
-          this.openURL(manifest.fullLaunchPath(), data.origin);
-        }).bind(this));
+        WebappOSUtils.launch(data);
         break;
     }
   },

diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/src/Webapps.jsm
@@ -14,7 +14,6 @@ let EXPORTED_SYMBOLS = ["DOMApplicationRegistry", "DOMApplicationManifest"];
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("resource://gre/modules/WebappOSUtils.jsm");
 
 const WEBAPP_RUNTIME = Services.appinfo.ID == "webapprt@mozilla.org";
 
@@ -172,7 +171,7 @@ let DOMApplicationRegistry = {
         this.uninstall(msg);
         break;
       case "Webapps:Launch":
-        WebappOSUtils.launch(msg);
+        Services.obs.notifyObservers(this, "webapps-launch", JSON.stringify(msg));
         break;
       case "Webapps:GetInstalled":
         this.getInstalled(msg);

diff --git a/toolkit/webapps/WebappOSUtils.jsm b/toolkit/webapps/WebappOSUtils.jsm
@@ -5,6 +5,9 @@
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const CC = Components.Constructor;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
 
 let EXPORTED_SYMBOLS = ["WebappOSUtils"];
 
@@ -73,9 +76,6 @@ let WebappOSUtils = {
     } catch (e) {}
 
     return false;
-#else
-    Services.obs.notifyObservers(this, "webapps-launch", JSON.stringify(aData));
-    return true;
 #endif
   }
 }
diff --git a/webapprt/WebappsHandler.jsm b/webapprt/WebappsHandler.jsm
@@ -13,6 +13,7 @@ let Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Webapps.jsm");
 Cu.import("resource://gre/modules/WebappsInstaller.jsm");
+Cu.import("resource://gre/modules/WebappOSUtils.jsm");
 
 let WebappsHandler = {
   init: function() {
@@ -30,6 +31,7 @@ let WebappsHandler = {
           this.doInstall(data, chromeWin);
         break;
       case "webapps-launch":
+        WebappOSUtils.launch(data);
         break;
     }
   },