Commit d66dc184 authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge autoland to central, a=merge 

MozReview-Commit-ID: J5jFY2n8iVG
parents d29c8325 81b83c31

browser/app/permissions

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


# UITour

origin	uitour	1	https://www.mozilla.org

origin	uitour	1	https://screenshots.firefox.com

origin	uitour	1	https://support.mozilla.org

origin	uitour	1	https://addons.mozilla.org

origin	uitour	1	https://discovery.addons.mozilla.org

browser/base/content/browser-places.js

+4 −7
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ var PlacesToolbarHelper = { 
    return document.getElementById("PlacesToolbar");

  },



  init: function PTH_init(forceToolbarOverflowCheck) {

  init: function PTH_init() {

    let viewElt = this._viewElt;

    if (!viewElt || viewElt._placesView)

      return;
@@ -1180,15 +1180,12 @@ var PlacesToolbarHelper = { 
    }



    new PlacesToolbar(this._place);

    if (forceToolbarOverflowCheck) {

      viewElt._placesView.updateOverflowStatus();

    }

  },



  handleEvent(event) {

    switch (event.type) {

      case "toolbarvisibilitychange":

        if (event.target == this._viewElt.parentNode.parentNode)

        if (event.target == this._getParentToolbar(this._viewElt))

          this._resetView();

        break;

    }
@@ -1214,7 +1211,7 @@ var PlacesToolbarHelper = { 


  customizeDone: function PTH_customizeDone() {

    this._isCustomizing = false;

    this.init(true);

    this.init();

  },



  onPlaceholderCommand() {
@@ -1265,7 +1262,7 @@ var PlacesToolbarHelper = { 
      if (this._viewElt._placesView) {

        this._viewElt._placesView.uninit();

      }

      this.init(true);

      this.init();

    }

  },

};

browser/base/content/browser.js

+8 −8
Original line number Diff line number Diff line
@@ -7494,20 +7494,20 @@ var gIdentityHandler = { 
    }



    // Push the appropriate strings out to the UI

    this._connectionIcon.tooltipText = tooltip;

    this._connectionIcon.setAttribute("tooltiptext", tooltip);



    if (this._isExtensionPage) {

      let extensionName = extensionNameFromURI(this._uri);

      this._extensionIcon.tooltipText = gNavigatorBundle.getFormattedString(

        "identity.extension.tooltip", [extensionName]);

      this._extensionIcon.setAttribute("tooltiptext",

        gNavigatorBundle.getFormattedString("identity.extension.tooltip", [extensionName]));

    }



    this._identityIconLabels.tooltipText = tooltip;

    this._identityIcon.tooltipText = gNavigatorBundle.getString("identity.icon.tooltip");

    this._identityIconLabel.value = icon_label;

    this._identityIconCountryLabel.value = icon_country_label;

    this._identityIconLabels.setAttribute("tooltiptext", tooltip);

    this._identityIcon.setAttribute("tooltiptext", gNavigatorBundle.getString("identity.icon.tooltip"));

    this._identityIconLabel.setAttribute("value", icon_label);

    this._identityIconCountryLabel.setAttribute("value", icon_country_label);

    // Set cropping and direction

    this._identityIconLabel.crop = icon_country_label ? "end" : "center";

    this._identityIconLabel.setAttribute("crop", icon_country_label ? "end" : "center");

    this._identityIconLabel.parentNode.style.direction = icon_labels_dir;

    // Hide completely if the organization label is empty

    this._identityIconLabel.parentNode.collapsed = !icon_label;

browser/base/content/newtab/newTab.css

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ input[type=button] { 
  transition: opacity 100ms ease-out;

  -moz-box-align: center;

  -moz-box-pack: center;

  position: relative;

  left: -50%;

}



#newtab-undo-container[undo-disabled] {
@@ -65,7 +67,7 @@ input[type=button] { 


#newtab-margin-undo-container {

  display: -moz-box;

  left: 6px;

  left: 50%;

  position: absolute;

  top: 6px;

  z-index: 1;

browser/base/content/test/performance/browser.ini

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ skip-if = asan || debug # Bug 1382809, bug 1369959 
[browser_startup.js]

[browser_startup_content.js]

skip-if = !e10s

[browser_startup_images.js]

skip-if = !debug

[browser_tabclose_grow_reflows.js]

[browser_tabclose_reflows.js]

[browser_tabopen_reflows.js]