Bug 1539918 - remove nightly-only guard and allow about:compat to ride the trains; r=miketaylr
authorThomas Wisniewski <twisniewski@mozilla.com>
Mon, 22 Apr 2019 15:04:49 +0000
changeset 470364 47d1596a579ff86f45311cb5eb25e18b99b14b78
parent 470363 d3b41d3190e54ded4fb5c3894042e4d067865c82
child 470365 497561b767374edfe627dcdbadd9b05133c9bf71
push id112868
push useropoprus@mozilla.com
push dateMon, 22 Apr 2019 22:19:22 +0000
treeherdermozilla-inbound@24537856cc88 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmiketaylr
bugs1539918
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1539918 - remove nightly-only guard and allow about:compat to ride the trains; r=miketaylr remove nightly-only guard and allow about:compat to ride the trains Differential Revision: https://phabricator.services.mozilla.com/D28206
browser/extensions/webcompat/aboutCompat.html
browser/extensions/webcompat/aboutPage.js
mobile/android/extensions/webcompat/aboutCompat.html
mobile/android/extensions/webcompat/aboutPage.js
--- a/browser/extensions/webcompat/aboutCompat.html
+++ b/browser/extensions/webcompat/aboutCompat.html
@@ -3,17 +3,17 @@
 <head>
   <base/>
   <!-- If you change this script tag you must update the hash in the extension's
          `content_security_policy` 'sha256-HbSjs39Y0thRGfO3RHrNzLPKyC/tq6FdIuP3jEBAcJQ=' -->
   <script>document.head.firstElementChild.href = browser.runtime.getURL("");</script>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="stylesheet" href="aboutCompat.css" />
-  <link rel="stylesheet" media="screen and (min-device-width:481px), projection" type="text/css"
+  <link rel="stylesheet" media="screen and (pointer:fine), projection" type="text/css"
           href="chrome://global/skin/in-content/common.css"/>
   <link rel="localization" href="toolkit/about/aboutCompat.ftl"/>
   <title data-l10n-id="text-title"></title>
   <script src="aboutCompat.js"></script>
   </head>
 <body>
   <h2 class="tab active" data-l10n-id="label-overrides"></h2>
   <table id="overrides">
--- a/browser/extensions/webcompat/aboutPage.js
+++ b/browser/extensions/webcompat/aboutPage.js
@@ -1,47 +1,34 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 /* global ExtensionAPI, Services, XPCOMUtils */
 
-ChromeUtils.defineModuleGetter(this, "AppConstants",
-                               "resource://gre/modules/AppConstants.jsm");
-
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "resProto",
                                    "@mozilla.org/network/protocol;1?name=resource",
                                    "nsISubstitutingProtocolHandler");
 
 const ResourceSubstitution = "webcompat";
 const ProcessScriptURL = "resource://webcompat/aboutPageProcessScript.js";
 
-const ShouldStart = ["default", "nightly", "nightly-try"].includes(AppConstants.MOZ_UPDATE_CHANNEL);
-
 this.aboutPage = class extends ExtensionAPI {
   onStartup() {
-    if (!ShouldStart) {
-      return;
-    }
-
     const {rootURI} = this.extension;
 
     resProto.setSubstitution(ResourceSubstitution,
                              Services.io.newURI("chrome/res/", null, rootURI));
 
     Services.ppmm.loadProcessScript(ProcessScriptURL, true);
   }
 
   onShutdown() {
-    if (!ShouldStart) {
-      return;
-    }
-
     resProto.setSubstitution(ResourceSubstitution, null);
 
     Services.ppmm.removeDelayedProcessScript(ProcessScriptURL);
   }
 };
--- a/mobile/android/extensions/webcompat/aboutCompat.html
+++ b/mobile/android/extensions/webcompat/aboutCompat.html
@@ -3,17 +3,17 @@
 <head>
   <base/>
   <!-- If you change this script tag you must update the hash in the extension's
          `content_security_policy` 'sha256-HbSjs39Y0thRGfO3RHrNzLPKyC/tq6FdIuP3jEBAcJQ=' -->
   <script>document.head.firstElementChild.href = browser.runtime.getURL("");</script>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="stylesheet" href="aboutCompat.css" />
-  <link rel="stylesheet" media="screen and (min-device-width:481px), projection" type="text/css"
+  <link rel="stylesheet" media="screen and (pointer:fine), projection" type="text/css"
           href="chrome://global/skin/in-content/common.css"/>
   <link rel="localization" href="toolkit/about/aboutCompat.ftl"/>
   <title data-l10n-id="text-title"></title>
   <script src="aboutCompat.js"></script>
   </head>
 <body>
   <h2 class="tab active" data-l10n-id="label-overrides"></h2>
   <table id="overrides">
--- a/mobile/android/extensions/webcompat/aboutPage.js
+++ b/mobile/android/extensions/webcompat/aboutPage.js
@@ -1,47 +1,34 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 /* global ExtensionAPI, Services, XPCOMUtils */
 
-ChromeUtils.defineModuleGetter(this, "AppConstants",
-                               "resource://gre/modules/AppConstants.jsm");
-
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "resProto",
                                    "@mozilla.org/network/protocol;1?name=resource",
                                    "nsISubstitutingProtocolHandler");
 
 const ResourceSubstitution = "webcompat";
 const ProcessScriptURL = "resource://webcompat/aboutPageProcessScript.js";
 
-const ShouldStart = ["default", "nightly", "nightly-try"].includes(AppConstants.MOZ_UPDATE_CHANNEL);
-
 this.aboutPage = class extends ExtensionAPI {
   onStartup() {
-    if (!ShouldStart) {
-      return;
-    }
-
     const {rootURI} = this.extension;
 
     resProto.setSubstitution(ResourceSubstitution,
                              Services.io.newURI("chrome/res/", null, rootURI));
 
     Services.ppmm.loadProcessScript(ProcessScriptURL, true);
   }
 
   onShutdown() {
-    if (!ShouldStart) {
-      return;
-    }
-
     resProto.setSubstitution(ResourceSubstitution, null);
 
     Services.ppmm.removeDelayedProcessScript(ProcessScriptURL);
   }
 };