Bug 1577449 - Replace Learn about Send Tab link. r=markh
authorEdouard Oger <eoger@fastmail.com>
Tue, 24 Sep 2019 22:50:36 +0000
changeset 494812 ac0a69cbf49de19f0a71901d29daf306e156bdfa
parent 494811 0a3d13728cbc1f7c344ade25368e841d227b3f7c
child 494813 e61a4313ae33cac41e7828a0910e9cba84beee2a
push id96249
push usereoger@mozilla.com
push dateTue, 24 Sep 2019 22:54:44 +0000
treeherderautoland@ac0a69cbf49d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1577449
milestone71.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 1577449 - Replace Learn about Send Tab link. r=markh Differential Revision: https://phabricator.services.mozilla.com/D46631
browser/app/profile/firefox.js
browser/base/content/browser-sync.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -977,19 +977,16 @@ pref("app.support.baseURL", "https://sup
 
 // base url for web-based feedback pages
 #ifdef MOZ_DEV_EDITION
   pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
 #else
   pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
 #endif
 
-// base URL for web-based marketing pages
-pref("app.productInfo.baseURL", "https://www.mozilla.org/firefox/features/");
-
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
 pref("security.alternate_certificate_error_page", "certerror");
 
 pref("security.certerrors.recordEventTelemetry", true);
 pref("security.certerrors.permanentOverride", true);
 pref("security.certerrors.mitm.priming.enabled", true);
 pref("security.certerrors.mitm.priming.endpoint", "https://mitmdetection.services.mozilla.com/");
 pref("security.certerrors.mitm.auto_enable_enterprise_roots", true);
@@ -1452,16 +1449,19 @@ pref("identity.fxaccounts.remote.pairing
 pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5");
 
 // Auto-config URL for FxA self-hosters, makes an HTTP request to
 // [identity.fxaccounts.autoconfig.uri]/.well-known/fxa-client-configuration
 // This is now the prefered way of pointing to a custom FxA server, instead
 // of making changes to "identity.fxaccounts.*.uri".
 pref("identity.fxaccounts.autoconfig.uri", "");
 
+// URL for help link about Send Tab.
+pref("identity.sendtabpromo.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/send-tab");
+
 // URLs for promo links to mobile browsers. Note that consumers are expected to
 // append a value for utm_campaign.
 pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
 pref("identity.mobilepromo.ios", "https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
 
 // Migrate any existing Firefox Account data from the default profile to the
 // Developer Edition profile.
 #ifdef MOZ_DEV_EDITION
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -112,21 +112,16 @@ var gSync = {
             `Failed to build url filter regexp for send tab: ${e}`
           );
           return null;
         }
       }
     );
     XPCOMUtils.defineLazyPreferenceGetter(
       this,
-      "PRODUCT_INFO_BASE_URL",
-      "app.productInfo.baseURL"
-    );
-    XPCOMUtils.defineLazyPreferenceGetter(
-      this,
       "FXA_ENABLED",
       "identity.fxaccounts.enabled"
     );
   },
 
   maybeUpdateUIState() {
     // Update the UI.
     if (UIState.isReady()) {
@@ -627,18 +622,19 @@ var gSync = {
     let entryPoint = "fxa_discoverability_native";
     if (this.isPanelInsideAppMenu(panel)) {
       entryPoint = "fxa_app_menu";
     }
     this.openConnectAnotherDevice(entryPoint);
   },
 
   openSendToDevicePromo() {
-    let url = this.PRODUCT_INFO_BASE_URL;
-    url += "send-tabs/?utm_source=" + Services.appinfo.name.toLowerCase();
+    const url = Services.urlFormatter.formatURLPref(
+      "identity.sendtabpromo.url"
+    );
     switchToTabHavingURI(url, true, { replaceQueryString: true });
   },
 
   async clickFxAMenuHeaderButton(panel = undefined) {
     // Depending on the current logged in state of a user,
     // clicking the FxA header will either open
     // a sign-in page, account management page, or sync
     // preferences page.