Commit 4eb51401 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge autoland to m-c. a=merge

parents 184f0c78 19b7ef83

browser/app/profile/firefox.js

+5 −0
Original line number Diff line number Diff line
@@ -1700,6 +1700,11 @@ pref("extensions.formautofill.available", "staged-rollout"); 
pref("extensions.formautofill.available", "detect");

#endif

pref("extensions.formautofill.addresses.enabled", true);

#ifdef NIGHTLY_BUILD

pref("extensions.formautofill.creditCards.available", true);

#else

pref("extensions.formautofill.creditCards.available", false);

#endif

pref("extensions.formautofill.creditCards.enabled", true);

pref("extensions.formautofill.firstTimeUse", true);

pref("extensions.formautofill.heuristics.enabled", true);

browser/base/content/browser.css

+13 −0
Original line number Diff line number Diff line
@@ -546,6 +546,19 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks { 
  -moz-binding: url(chrome://browser/content/urlbarBindings.xml#urlbar);

}



/* Display URLs left-to-right but right aligned in RTL mode. */

html|input.urlbar-input:-moz-locale-dir(rtl) {

  direction: ltr !important;

  text-align: right !important;

}



/* Make sure that the location bar's alignment in RTL mode changes according

   to the input box direction if the user switches the text direction using

   cmd_switchTextDirection (which applies a dir attribute to the <input>). */

html|input.urlbar-input[dir=ltr]:-moz-locale-dir(rtl) {

  text-align: left !important;

}



/*

 * Display visual cue that browser is under remote control by Marionette.

 * This is to help users visually distinguish a user agent session that

browser/base/content/urlbarBindings.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. 
                  flex="1" xbl:inherits="tooltiptext=inputtooltiptext">

          <children/>

          <html:input anonid="input"

                      class="autocomplete-textbox urlbar-input textbox-input uri-element-right-align"

                      class="autocomplete-textbox urlbar-input textbox-input"

                      allowevents="true"

                      inputmode="url"

                      xbl:inherits="tooltiptext=inputtooltiptext,value,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,focused,textoverflow"/>

browser/components/customizableui/SearchWidgetTracker.jsm

+7 −2
Original line number Diff line number Diff line
@@ -36,10 +36,15 @@ const SearchWidgetTracker = { 
    CustomizableUI.addListener(this);

    Services.prefs.addObserver(PREF_NAME,

                               () => this.syncWidgetWithPreference());

  },



  onAreaNodeRegistered(aArea) {

    // The placement of the widget always takes priority, and the preference

    // should always match the actual placement when the browser starts up.

    // should always match the actual placement when the browser starts up - i.e.

    // once the navigation bar has been registered.

    if (aArea == CustomizableUI.AREA_NAVBAR) {

      this.syncPreferenceWithWidget();

    }

  },



  onCustomizeEnd() {

browser/components/extensions/ext-c-devtools-panels.js

+9 −0
Original line number Diff line number Diff line
@@ -222,6 +222,15 @@ class ChildDevToolsInspectorSidebar extends ExtensionUtils.EventEmitter { 
          );

        });

      },



      setExpression(evalExpression, rootTitle) {

        return context.cloneScope.Promise.resolve().then(() => {

          return context.childManager.callParentAsyncFunction(

            "devtools.panels.elements.Sidebar.setExpression",

            [id, evalExpression, rootTitle]

          );

        });

      },

    };

  }

}