Commit 51035a62 authored by Mihai Alexandru Michis's avatar Mihai Alexandru Michis
Browse files

Merge mozilla-central to mozilla-inbound.

parents 4ea5e0bb 2466a0bc

browser/app/blocklist.xml

+5 −1
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='UTF-8'?>

<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1565344753436">

<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1566422986828">

  <emItems>

    <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">

      <prefs/>
@@ -3369,6 +3369,10 @@ 
      <prefs/>

      <versionRange minVersion="0" maxVersion="*" severity="3"/>

    </emItem>

    <emItem blockID="055d2447-c7b7-49a2-bb27-b1c09a592f32" id="/^((\{fb2cbb8e-a6f9-464b-97c7-aca958a404d6\})|(\{8cc60aa4-fceb-4a74-bef4-bbbdc23b85fb\}))$/">

      <prefs/>

      <versionRange minVersion="0" maxVersion="*" severity="3"/>

    </emItem>

  </emItems>

  <pluginItems>

    <pluginItem blockID="p332">

browser/app/profile/firefox.js

+3 −0
Original line number Diff line number Diff line
@@ -400,6 +400,8 @@ pref("permissions.default.shortcuts", 0); 
  pref("permissions.desktop-notification.postPrompt.enabled", false);

#endif



pref("permissions.desktop-notification.notNow.enabled", false);



pref("permissions.fullscreen.allowed", false);



pref("permissions.postPrompt.animate", true);
@@ -1305,6 +1307,7 @@ pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts", 


// ASRouter provider configuration

pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{\"id\":\"cfr\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"cfr\",\"frequency\":{\"custom\":[{\"period\":\"daily\",\"cap\":1}]},\"categories\":[\"cfrAddons\",\"cfrFeatures\"],\"updateCycleInMs\":3600000}");

pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "{\"id\":\"whats-new-panel\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"whats-new-panel\",\"updateCycleInMs\":3600000}");

// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into

// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream

// repackager of this code using an alternate snippet url, please keep your users safe

browser/base/content/browser-sets.inc

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
    <command id="cmd_gestureRotateLeft" oncommand="gGestureSupport.rotate(event.sourceEvent)"/>

    <command id="cmd_gestureRotateRight" oncommand="gGestureSupport.rotate(event.sourceEvent)"/>

    <command id="cmd_gestureRotateEnd" oncommand="gGestureSupport.rotateEnd()"/>

    <command id="Browser:OpenLocation" oncommand="openLocation();"/>

    <command id="Browser:OpenLocation" oncommand="openLocation(event);"/>

    <command id="Browser:RestoreLastSession" oncommand="SessionStore.restoreLastSession();" disabled="true"/>

    <command id="Browser:NewUserContextTab" oncommand="openNewUserContextTab(event.sourceEvent);"/>

    <command id="Browser:OpenAboutContainers" oncommand="openPreferences('paneContainers');"/>

browser/base/content/browser-siteProtections.js

+4 −13
Original line number Diff line number Diff line
@@ -1612,12 +1612,6 @@ var gProtectionsHandler = { 
    if (event.target == this._protectionsPopup) {

      window.removeEventListener("focus", this, true);

      gIdentityHandler._trackingProtectionIconContainer.removeAttribute("open");



      // Hide the tracker counter when the popup get hidden.

      this._protectionsPopupTrackersCounterBox.toggleAttribute(

        "showing",

        false

      );

    }

  },
@@ -1910,12 +1904,6 @@ var gProtectionsHandler = { 
      );

    }



    // Show the blocked tracker counter if it is not updating. We can sure the

    // data in the tracker counter is up-to-date here, so we can show it.

    if (!this._updatingFooter) {

      this._protectionsPopupTrackersCounterBox.toggleAttribute("showing", true);

    }



    // Update the tooltip of the blocked tracker counter.

    this.maybeUpdateEarliestRecordedDateTooltip();

  },
@@ -1988,7 +1976,10 @@ var gProtectionsHandler = { 
    this._protectionsPopupTrackersCounterDescription.textContent = PluralForm.get(

      trackerCount,

      forms

    ).replace("#1", trackerCount);

    ).replace(

      "#1",

      trackerCount.toLocaleString(Services.locale.appLocalesAsBCP47)

    );



    // Show the counter if the number of tracker is not zero.

    this._protectionsPopupTrackersCounterBox.toggleAttribute(

browser/base/content/browser-sync.js

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ var gSync = { 
    }



    const url = new URL(serviceUrl);

    url.searchParams.set("utm_source", Services.appinfo.name.toLowerCase());

    url.searchParams.set("utm_source", "fxa-toolbar");

    url.searchParams.set("entrypoint", entryPoint);



    const state = UIState.get();