Bug 1360448 - Only ignore OPTIONS_TYPE_INLINE_BROWSER instead of ignoring all types which aren't OPTIONS_TYPE_INLINE r=mixedpuppy a=gchang
authorMatthew Wein <mwein@mozilla.com>
Wed, 10 May 2017 22:54:40 -0400
changeset 394029 0386af1703e2aa3e4ac87667ad5a56a08314bcfe
parent 394028 3563f72474d33d5be8ef013d8b84e457d2fe15be
child 394030 cf1d4e65a1d1b7f2b1d33116669b2298212228c5
push id7334
push usercbook@mozilla.com
push dateMon, 22 May 2017 09:54:57 +0000
treeherdermozilla-beta@0386af1703e2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmixedpuppy, gchang
bugs1360448
milestone54.0
Bug 1360448 - Only ignore OPTIONS_TYPE_INLINE_BROWSER instead of ignoring all types which aren't OPTIONS_TYPE_INLINE r=mixedpuppy a=gchang MozReview-Commit-ID: Ks3Yryy22lL
mobile/android/chrome/content/aboutAddons.js
--- a/mobile/android/chrome/content/aboutAddons.js
+++ b/mobile/android/chrome/content/aboutAddons.js
@@ -220,25 +220,21 @@ var Addons = {
   },
 
   _createItemForAddon: function _createItemForAddon(aAddon) {
     let appManaged = (aAddon.scope == AddonManager.SCOPE_APPLICATION);
     let opType = this._getOpTypeForOperations(aAddon.pendingOperations);
     let updateable = (aAddon.permissions & AddonManager.PERM_CAN_UPGRADE) > 0;
     let uninstallable = (aAddon.permissions & AddonManager.PERM_CAN_UNINSTALL) > 0;
 
-    let optionsURL;
-    switch (parseInt(aAddon.optionsType)) {
-      case AddonManager.OPTIONS_TYPE_INLINE:
-        optionsURL = aAddon.optionsURL || "";
-        break;
-      default:
-        // Bug 1302504 - Ignore WebExtension options (which are type OPTIONS_TYPE_INLINE_BROWSER)
-        // until options_ui support is added - Bug 1302504.
-        optionsURL = "";
+    let optionsURL = aAddon.optionsURL || "";
+
+    if (aAddon.optionsType == AddonManager.OPTIONS_TYPE_INLINE_BROWSER) {
+      // Ignore OPTIONS_TYPE_INLINE_BROWSER until support is added in bug 1302504.
+      optionsURL = "";
     }
 
     let blocked = "";
     switch(aAddon.blocklistState) {
       case Ci.nsIBlocklistService.STATE_BLOCKED:
         blocked = "blocked";
         break;
       case Ci.nsIBlocklistService.STATE_SOFTBLOCKED: