Merge branch 'redwood' into 28.9-platform

3 files changed, 26 insertions, 22 deletions

diff --git a/toolkit/mozapps/extensions/content/extensions.css b/toolkit/mozapps/extensions/content/extensions.css
index 41c140565..51828d544 100644
--- a/toolkit/mozapps/extensions/content/extensions.css
+++ b/toolkit/mozapps/extensions/content/extensions.css
@@ -152,8 +152,6 @@ setting[type="menulist"] {
 .addon:not([notification="info"]) .info,
 .addon:not([pending]) .pending,
 .addon:not([upgrade="true"]) .update-postfix,
-.addon:not([native="true"]) .nativeAddon,
-.addon:not([native="false"]) .compatAddon,
 .addon[active="true"] .disabled-postfix,
 .addon[pending="install"] .update-postfix,
 .addon[pending="install"] .disabled-postfix,
@@ -266,21 +264,6 @@ richlistitem:not([selected]) * {
   display: none;
 }
 
-/* Indicator style for extension target application */
-.addon[native] .nativeIndicator {
-  margin-left: 5pt;
-  padding-bottom: 1pt;
-}
-.addon[native][active="false"] .nativeIndicator {
-  opacity: 0.4;
-}
-.addon[native] .nativeAddon {
-  color: #3366FF;
-}
-.addon[native] .compatAddon {
-  color: #FF6600;
-}
-
 /* Translators for Language Pack details */
 .translators > label {
   -moz-margin-start: 0px;
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 9576e9a3b..3c3b5894b 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -3059,6 +3059,19 @@ var gDetailView = {
         warning.textContent =
           gStrings.ext.formatStringFromName("details.notification.gmpPending",
                                             [this._addon.name], 1);
+#ifdef MOZ_PHOENIX_EXTENSIONS
+      } else if (this._addon.native == false) {
+        this.node.setAttribute("notification", "warning");
+        this.node.setAttribute("native", "false");
+        document.getElementById("detail-warning").textContent = gStrings.ext.formatStringFromName(
+          "details.notification.compatibility",
+          [this._addon.name, gStrings.brandShortName], 2
+        );
+        var warningLink = document.getElementById("detail-warning-link");
+        warningLink.value = gStrings.ext.GetStringFromName("details.notification.compatibility.link");
+        warningLink.href = Services.urlFormatter.formatURLPref("extensions.compatibility.url");
+        warningLink.hidden = false;
+#endif
       } else {
         this.node.removeAttribute("notification");
       }
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 9c8fda8ed..e2eef852a 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -857,10 +857,6 @@
                 <xul:label anonid="name" class="name" crop="end" flex="1"
                            xbl:inherits="value=name,tooltiptext=name"/>
                 <xul:label anonid="version" class="version"/>
-#ifdef MOZ_PHOENIX_EXTENSIONS
-                <xul:label class="nativeIndicator nativeAddon" value="●" tooltiptext="&addon.nativeAddon;"/>
-                <xul:label class="nativeIndicator compatAddon" value="●" tooltiptext="&addon.compatAddon;"/>
-#endif
                 <xul:label class="disabled-postfix" value="&addon.disabled.postfix;"/>
                 <xul:label class="update-postfix" value="&addon.update.postfix;"/>
                 <xul:spacer flex="5000"/> <!-- Necessary to make the name crop -->
@@ -1359,8 +1355,20 @@
             } else {
               this.removeAttribute("notification");
 #ifdef MOZ_PHOENIX_EXTENSIONS
-              if (this.mAddon.type == "extension")
+              if (this.mAddon.type == "extension") {
                 this.setAttribute("native", this.mAddon.native);
+                if (this.mAddon.native == false) {
+                  this.setAttribute("notification", "warning");
+                  this._warning.textContent = gStrings.ext.formatStringFromName(
+                    "notification.compatibility",
+                    [this.mAddon.name, gStrings.brandShortName], 2
+                  );
+                  this._warningLink.value = gStrings.ext.GetStringFromName("notification.compatibility.link");
+                  this._warningLink.href = Services.urlFormatter.formatURLPref("extensions.compatibility.url");
+                  this._warningLink.hidden = false;
+                  this._warningBtn.hidden = true;
+                }
+              }
 #endif
             }
           }