Commit d6a7a044 authored by Sergey Galich's avatar Sergey Galich
Browse files

Bug 1751763 - Firefox Relay integration... 

Bug 1751763 - Firefox Relay integration r=dimi,flod,mconley,desktop-theme-reviewers,dao,sfoster,geckoview-reviewers,jonalmeida

Differential Revision: https://phabricator.services.mozilla.com/D158155
parent 13c3a0c6

browser/app/profile/firefox.js

+6 −1
Original line number Diff line number Diff line
@@ -2177,7 +2177,12 @@ pref("extensions.pocket.refresh.hideRecentSaves.enabled", false); 
pref("signon.management.page.fileImport.enabled", false);



#ifdef NIGHTLY_BUILD

pref("signon.management.page.os-auth.enabled", true);

pref("signon.management.page.os-auth.enabled", false);

// "available" - user can see feature offer.

// "offered"   - we have offered feature to user and they have not yet made a decision.

// "enabled"   - user opted in to the feature.

// "disabled"  - user opted out of the feature.

pref("signon.firefoxRelay.feature", "available");

#else

pref("signon.management.page.os-auth.enabled", false);

#endif

browser/base/content/browser.js

+1 −0
Original line number Diff line number Diff line
@@ -9958,6 +9958,7 @@ var ConfirmationHint = { 
  show(anchor, messageId, options = {}) {

    this._reset();



    MozXULElement.insertFTLIfNeeded("browser/branding/brandings.ftl");

    MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");

    document.l10n.setAttributes(this._message, messageId);

browser/base/content/logos/relay.svg

0 → 100644
+33 −0
Original line number Diff line number Diff line 
<!-- 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/. -->

<svg xmlns="http://www.w3.org/2000/svg"

  viewBox="0 0 77.2 79.73">

  <defs>

    <linearGradient id="a" x1="460.66" y1="-120.15" x2="449.39" y2="-109.49"

      gradientTransform="matrix(1 0 0 -1 -389 -47.01)" gradientUnits="userSpaceOnUse">

      <stop offset="0" stop-color="#054096" stop-opacity=".5" />

      <stop offset=".1" stop-color="#173ba1" stop-opacity=".44" />

      <stop offset=".29" stop-color="#3434b3" stop-opacity=".33" />

      <stop offset=".49" stop-color="#482ec1" stop-opacity=".22" />

      <stop offset=".68" stop-color="#552bc8" stop-opacity=".11" />

      <stop offset=".86" stop-color="#592acb" stop-opacity="0" />

    </linearGradient>

    <linearGradient id="b" x1="3.39" y1="42.56" x2="73.6" y2="42.56" gradientTransform="matrix(1 0 0 -1 0 82.99)"

      gradientUnits="userSpaceOnUse">

      <stop offset="0" stop-color="#9059ff" />

      <stop offset="1" stop-color="#f770ff" />

    </linearGradient>

    <linearGradient id="c" x1="40.92" y1="20.28" x2="81.59" y2="3.07" gradientTransform="matrix(1 0 0 -1 0 82.99)"

      gradientUnits="userSpaceOnUse">

      <stop offset="0" stop-color="#54ffbd" />

      <stop offset="1" stop-color="#0df" />

    </linearGradient>

  </defs>

  <path

    d="M70.19 18.69l-28.4-16a6.81 6.81 0 00-6.5 0l-28.5 16a6.68 6.68 0 00-3.4 5.8v31.9a6.56 6.56 0 003.4 5.8l28.4 15.9a6.29 6.29 0 003.3.9 6.56 6.56 0 003.3-.9l28.4-15.9a6.68 6.68 0 003.4-5.8v-31.9a6.38 6.38 0 00-3.4-5.8z"

    transform="translate(-3.39 -1.87)" fill="url(#b)" />

  <path

    d="M15.3 46.92l-1.7 1a2.62 2.62 0 00-1 3.6 2.65 2.65 0 002.3 1.4 3.08 3.08 0 001.3-.3l1.7-1a2.62 2.62 0 001-3.6 2.57 2.57 0 00-3.6-1.1zm10.4-5.9l-3.5 2a2.62 2.62 0 00-1 3.6 2.65 2.65 0 002.3 1.4 3.08 3.08 0 001.3-.3l3.5-2a2.62 2.62 0 001-3.6 2.57 2.57 0 00-3.6-1.1zm14.1-4.89a2.36 2.36 0 00-1.4-1.2V14.82a2.69 2.69 0 00-2.7-2.7 2.61 2.61 0 00-2.6 2.7v20.2a2.36 2.36 0 00-1.4 1.2 2.66 2.66 0 00-.1 2.3 2.66 2.66 0 00.1 2.3 2.36 2.36 0 001.4 1.2v20.2a2.7 2.7 0 005.4 0v-20.3a2.36 2.36 0 001.4-1.2 2.66 2.66 0 00.1-2.3 3.08 3.08 0 00-.2-2.29zm6.81-6.91l-3.5 2a2.62 2.62 0 00-1 3.6 2.65 2.65 0 002.3 1.4 3.08 3.08 0 001.3-.3l3.5-2a2.62 2.62 0 001-3.6 2.57 2.57 0 00-3.6-1.1zm8.29 1a3.08 3.08 0 001.3-.3l1.7-1a2.642 2.642 0 10-2.6-4.6l-1.7 1a2.62 2.62 0 00-1 3.6 2.56 2.56 0 002.3 1.3zm3 17.7l-1.7-1a2.642 2.642 0 00-2.6 4.6l1.7 1a3.08 3.08 0 001.3.3 2.65 2.65 0 002.3-1.4 2.47 2.47 0 00-1-3.5zm-8.7-4.9l-3.5-2a2.642 2.642 0 10-2.6 4.6l3.5 2a3.08 3.08 0 001.3.3 2.65 2.65 0 002.3-1.4 2.45 2.45 0 00-1-3.5zm-27-9.2l3.5 2a3.08 3.08 0 001.3.3 2.65 2.65 0 002.3-1.4 2.62 2.62 0 00-1-3.6l-3.5-2a2.62 2.62 0 00-3.6 1 2.8 2.8 0 001 3.7zm-4.3-8.5l-1.7-1a2.642 2.642 0 10-2.6 4.6l1.7 1a3.08 3.08 0 001.3.3 2.65 2.65 0 002.3-1.4 2.53 2.53 0 00-1-3.5z"

    fill="#20133a" />

</svg>

browser/base/content/popup-notifications.inc

+27 −0
Original line number Diff line number Diff line
@@ -195,3 +195,30 @@ 
        </html:template>

      </popupnotificationcontent>

    </popupnotification>



    <popupnotification id="relay-integration-offer-notification" hidden="true">

      <popupnotificationcontent orient="vertical">

        <html:div>    

          <html:p data-l10n-id="firefox-relay-offer-why-relay"></html:p>

          <html:p data-l10n-id="firefox-relay-offer-how-we-integrate"></html:p>

          <html:p id="firefox-relay-offer-what-relay-does" data-l10n-id="firefox-relay-offer-what-relay-does" data-l10n-args='{"sitename": "", "useremail": ""}'></html:p>

        </html:div>

      </popupnotificationcontent>

    </popupnotification>



    <popupnotification id="relay-integration-reuse-masks-notification" hidden="true">

      <popupnotificationcontent orient="vertical">

        <html:div>

          <html:p class="error-message"></html:p>

          <html:div class="reusable-relay-masks" />

        </html:div>

      </popupnotificationcontent>

    </popupnotification>



    <template id="firefox-relay-header">

      <html:div class="relay-integration-header">

        <html:img src="chrome://browser/content/logos/relay.svg" width="32" height="32" />

        <html:span>Firefox</html:span>

        <html:span> Relay</html:span>

      </html:div>

    </template>

browser/base/jar.mn

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ browser.jar: 
        content/browser/logos/etp-mobile.svg          (content/logos/etp-mobile.svg)

        content/browser/logos/lockwise.svg            (content/logos/lockwise.svg)

        content/browser/logos/monitor.svg             (content/logos/monitor.svg)

        content/browser/logos/relay.svg               (content/logos/relay.svg)

        content/browser/logos/vpn-promo-logo.svg      (content/logos/vpn-promo-logo.svg)

        content/browser/logos/proxy-light.svg         (content/logos/proxy-light.svg)

        content/browser/logos/proxy-dark.svg          (content/logos/proxy-dark.svg)