Commit 9a2448ee authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

Merge mozilla-central to mozilla-inbound

parents 794b92fe d2c3fe7f

CLOBBER

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
# changes to stick? As of bug 928195, this shouldn't be necessary! Please

# don't change CLOBBER for WebIDL changes any more.



Bug 1288460 requires another clobber due to bug 1298779.
 
Bug 1302429 to fix also bustage.

browser/app/profile/firefox.js

+11 −0
Original line number Diff line number Diff line
@@ -1507,3 +1507,14 @@ pref("print.use_simplify_page", true); 
// Space separated list of URLS that are allowed to send objects (instead of

// only strings) through webchannels. This list is duplicated in mobile/android/app/mobile.js

pref("webchannel.allowObject.urlWhitelist", "https://accounts.firefox.com https://content.cdn.mozilla.net https://input.mozilla.org https://support.mozilla.org https://install.mozilla.org");



// Whether or not the browser should scan for unsubmitted

// crash reports, and then show a notification for submitting

// those reports.

#ifdef RELEASE_BUILD

pref("browser.crashReports.unsubmittedCheck.enabled", false);

#else

pref("browser.crashReports.unsubmittedCheck.enabled", true);

#endif



pref("browser.crashReports.unsubmittedCheck.autoSubmit", false);
 
 No newline at end of file

browser/base/content/browser.css

+0 −11
Original line number Diff line number Diff line
@@ -777,13 +777,6 @@ html|*#fullscreen-exit-button { 
  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#click-to-play-plugins-notification");

}



#login-fill-notification {

  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#login-fill-notification");

}



.login-fill-item {

  -moz-binding: url("chrome://passwordmgr/content/login.xml#login");

}



.plugin-popupnotification-centeritem {

  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#plugin-popupnotification-center-item");
@@ -1185,10 +1178,6 @@ toolbarpaletteitem[place="palette"][hidden] { 
  display: none;

}



#login-fill-doorhanger:not([inDetailView]) > #login-fill-clickcapturer {

  pointer-events: none;

}



.popup-notification-invalid-input {

  box-shadow: 0 0 1.5px 1px red;

}

browser/base/content/browser.xul

+0 −2
Original line number Diff line number Diff line
@@ -718,8 +718,6 @@ 
                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>

                  <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"

                         tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>

                  <image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button"

                         tooltiptext="&urlbar.loginFillNotificationAnchor.tooltip;"/>

                  <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"

                         tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/>

                  <image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button"

browser/base/content/popup-notifications.inc

+0 −16
Original line number Diff line number Diff line
@@ -52,22 +52,6 @@ 
      </popupnotificationcontent>

    </popupnotification>



    <stack id="login-fill-doorhanger" hidden="true">

      <vbox id="login-fill-mainview">

        <description id="login-fill-testing"

                     value="Thanks for testing the login fill doorhanger!"/>

        <textbox id="login-fill-filter"/>

        <richlistbox id="login-fill-list"/>

      </vbox>

      <vbox id="login-fill-clickcapturer"/>

      <vbox id="login-fill-details">

        <textbox id="login-fill-username" readonly="true"/>

        <textbox id="login-fill-password" type="password" disabled="true"/>

        <hbox>

          <button id="login-fill-use" label="Use in form"/>

        </hbox>

      </vbox>

    </stack>



    <popupnotification id="addon-progress-notification" hidden="true">

      <popupnotificationcontent orient="vertical">