Bug 1171013 - Set Android apps to be launchable by default. r=mossop
authorEugen Sawin <esawin@mozilla.com>
Mon, 15 Jun 2015 19:14:47 +0200
changeset 267051 336d4a1f0f3cba256e8bd89061f1ed3f55b68d88
parent 266990 53a99d02925f98b41f0fc1b949254d513ceaed51
child 267052 ed8af79d301e2fccdf9dac5582fd6f89e87c69a3
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-esr52@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1171013
milestone41.0a1
Bug 1171013 - Set Android apps to be launchable by default. r=mossop
mobile/android/chrome/content/browser.js
toolkit/webapps/WebappOSUtils.jsm
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -450,19 +450,17 @@ var BrowserApp = {
     NativeWindow.init();
     LightWeightThemeWebInstaller.init();
     FormAssistant.init();
     IndexedDB.init();
     HealthReportStatusListener.init();
     XPInstallObserver.init();
     CharacterEncoding.init();
     ActivityObserver.init();
-    // TODO: replace with Android implementation of WebappOSUtils.isLaunchable.
     Cu.import("resource://gre/modules/Webapps.jsm");
-    DOMApplicationRegistry.allAppsLaunchable = true;
     RemoteDebugger.init();
     UserAgentOverrides.init();
     DesktopUserAgent.init();
     Distribution.init();
     Tabs.init();
     SearchEngines.init();
     if (AppConstants.ACCESSIBILITY) {
       AccessFu.attach(window);
--- a/toolkit/webapps/WebappOSUtils.jsm
+++ b/toolkit/webapps/WebappOSUtils.jsm
@@ -397,16 +397,20 @@ this.WebappOSUtils = {
     // better verify the installation path.
     return true;
   },
 
   /**
    * Checks if the given app is locally installed.
    */
   isLaunchable: function(aApp) {
+#ifdef MOZ_WIDGET_ANDROID
+    return true;
+#endif
+
     let uniqueName = this.getUniqueName(aApp);
 
 #ifdef XP_WIN
     if (!this.getLaunchTarget(aApp)) {
       return false;
     }
 
     return true;