Commit f0bb7297 authored by Brindusan Cristian's avatar Brindusan Cristian
Browse files

Merge mozilla-central to inbound. a=merge CLOSED TREE

parents aeca5512 b2cbe5ad

browser/actors/ContextMenuChild.jsm

+14 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ XPCOMUtils.defineLazyGetter(this, "PageMenuChild", () => { 
  return new tmp.PageMenuChild();

});



XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () =>

  Components.Constructor("@mozilla.org/referrer-info;1",

                         "nsIReferrerInfo",

                         "init"));



const messageListeners = {

  "ContextMenu:BookmarkFrame": function(aMessage) {

    let frame = this.getTarget(aMessage).ownerDocument;
@@ -602,6 +607,15 @@ class ContextMenuChild extends ActorChild { 


      data.context.targetAsCPOW = targetAsCPOW;



      data.referrerInfo = new ReferrerInfo(

        referrerPolicy,

        !context.linkHasNoReferrer,

        data.documentURIObject);

      data.frameReferrerInfo = new ReferrerInfo(

        referrerPolicy,

        !context.linkHasNoReferrer,

        referrer ? Services.io.newURI(referrer) : null);



      mainWin.setContextMenuContentData(data);

    }

  }

browser/base/content/utilityOverlay.js

+1 −2
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ function openLinkIn(url, where, params) { 
  var aAllowThirdPartyFixup = params.allowThirdPartyFixup;

  var aPostData             = params.postData;

  var aCharset              = params.charset;

  var aReferrerInfo       = ("referrerInfo" in params)

    ? params.referrerInfo

  var aReferrerInfo       = params.referrerInfo ? params.referrerInfo

    : new ReferrerInfo(Ci.nsIHttpChannel.REFERRER_POLICY_UNSET, true, null);

  var aRelatedToCurrent     = params.relatedToCurrent;

  var aAllowInheritPrincipal = !!params.allowInheritPrincipal;

browser/components/migration/content/migration.js

+16 −3
Original line number Diff line number Diff line
@@ -50,6 +50,20 @@ var MigrationWizard = { /* exported MigrationWizard */ 
      }

    }



    document.addEventListener("wizardcancel", function() { MigrationWizard.onWizardCancel(); });



    document.getElementById("selectProfile").addEventListener("pageshow", function() { MigrationWizard.onSelectProfilePageShow(); });

    document.getElementById("importItems").addEventListener("pageshow", function() { MigrationWizard.onImportItemsPageShow(); });

    document.getElementById("migrating").addEventListener("pageshow", function() { MigrationWizard.onMigratingPageShow(); });

    document.getElementById("done").addEventListener("pageshow", function() { MigrationWizard.onDonePageShow(); });



    document.getElementById("selectProfile").addEventListener("pagerewound", function() { MigrationWizard.onSelectProfilePageRewound(); });

    document.getElementById("importItems").addEventListener("pagerewound", function() { MigrationWizard.onImportItemsPageRewound(); });



    document.getElementById("selectProfile").addEventListener("pageadvanced", function() { MigrationWizard.onSelectProfilePageAdvanced(); });

    document.getElementById("importItems").addEventListener("pageadvanced", function() { MigrationWizard.onImportItemsPageAdvanced(); });

    document.getElementById("importSource").addEventListener("pageadvanced", function(e) { MigrationWizard.onImportSourcePageAdvanced(e); });



    this.onImportSourcePageShow();

  },
@@ -145,7 +159,7 @@ var MigrationWizard = { /* exported MigrationWizard */ 
    }

  },



  onImportSourcePageAdvanced() {

  onImportSourcePageAdvanced(event) {

    var newSource = document.getElementById("importSourceGroup").selectedItem.id;



    if (newSource == "nothing") {
@@ -155,7 +169,7 @@ var MigrationWizard = { /* exported MigrationWizard */ 
      Services.telemetry.getHistogramById("FX_MIGRATION_SOURCE_BROWSER")

                        .add(MigrationUtils.getSourceIdForTelemetry("nothing"));

      document.documentElement.cancel();

      return false;

      event.preventDefault();

    }



    if (!this._migrator || (newSource != this._source)) {
@@ -184,7 +198,6 @@ var MigrationWizard = { /* exported MigrationWizard */ 
      else

        this._selectedProfile = null;

    }

    return undefined;

  },



  // 2 - [Profile Selection]

browser/components/migration/content/migration.xul

+5 −16
Original line number Diff line number Diff line
@@ -15,15 +15,13 @@ 
        onunload="MigrationWizard.uninit()"

        style="width: 40em;"

        buttons="accept,cancel"

        branded="true"

        onwizardcancel="return MigrationWizard.onWizardCancel();">

        branded="true">



  <script type="application/javascript" src="chrome://global/content/customElements.js"/>

  <script type="application/javascript" src="chrome://browser/content/migration/migration.js"/>



  <wizardpage id="importSource" pageid="importSource" next="selectProfile"

              label="&importSource.title;"

              onpageadvanced="return MigrationWizard.onImportSourcePageAdvanced();">

              label="&importSource.title;">

#ifdef XP_WIN

    <description id="importAll" control="importSourceGroup">&importFrom.label;</description>

#else
@@ -60,10 +58,7 @@ 
  </wizardpage>



  <wizardpage id="selectProfile" pageid="selectProfile" label="&selectProfile.title;"

              next="importItems"

              onpageshow="return MigrationWizard.onSelectProfilePageShow();"

              onpagerewound="return MigrationWizard.onSelectProfilePageRewound();"

              onpageadvanced="return MigrationWizard.onSelectProfilePageAdvanced();">

              next="importItems">

    <description control="profiles">&selectProfile.label;</description>



    <radiogroup id="profiles" align="left"/>
@@ -71,9 +66,6 @@ 


  <wizardpage id="importItems" pageid="importItems" label="&importItems.title;"

              next="migrating"

              onpageshow="return MigrationWizard.onImportItemsPageShow();"

              onpagerewound="return MigrationWizard.onImportItemsPageRewound();"

              onpageadvanced="return MigrationWizard.onImportItemsPageAdvanced();"

              oncommand="MigrationWizard.onImportItemCommand();">

    <description control="dataSources">&importItems.label;</description>
@@ -81,19 +73,16 @@ 
  </wizardpage>



  <wizardpage id="migrating" pageid="migrating" label="&migrating.title;"

              next="done"

              onpageshow="MigrationWizard.onMigratingPageShow();">

              next="done">

    <description control="migratingItems">&migrating.label;</description>



    <vbox id="migratingItems" style="overflow: auto;" align="left" role="group"/>

  </wizardpage>



  <wizardpage id="done" pageid="done" label="&done.title;"

              onpageshow="MigrationWizard.onDonePageShow();">

  <wizardpage id="done" pageid="done" label="&done.title;">

    <description control="doneItems">&done.label;</description>



    <vbox id="doneItems" style="overflow: auto;" align="left" role="group"/>

  </wizardpage>



</wizard>

browser/components/uitour/UITour.jsm

+4 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,10 @@ var UITour = { 
      urlbar.value = SEARCH_STRING;

      urlbar.select();

      if (quantumbar) {

        urlbar.startQuery();

        urlbar.startQuery({

          searchString: SEARCH_STRING,

          allowAutofill: false,

        });

      } else {

        urlbar.controller.startSearch(SEARCH_STRING);

      }