Commit c2a4879d authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Merge fx-team to m-c.

parents 6435a8a9 f3e0c69f

browser/app/profile/firefox.js

+0 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,6 @@ pref("devtools.errorconsole.enabled", false); 
// Developer toolbar and GCLI preferences

pref("devtools.toolbar.enabled", true);

pref("devtools.toolbar.visible", false);

pref("devtools.gcli.allowSet", false);

pref("devtools.commands.dir", "");



// Enable the app manager

browser/base/content/browser-menubar.inc

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ 
                          command="Browser:OpenFile"

                          key="openFileKb"

                          accesskey="&openFileCmd.accesskey;"/>

#ifdef HAVE_SHELL_SERVICE

#ifdef XP_WIN

#ifdef MOZ_METRO

                <menuitem id="menu_switchToMetro"

                          label="&switchToMetroCmd2.label;"

                          oncommand="SwitchToMetro()"/>

#endif

#endif

#endif

                <menuitem id="menu_close"

                          class="show-only-for-keyboard"

                          label="&closeCmd.label;"

browser/base/content/browser-webrtcUI.js

+2 −0
Original line number Diff line number Diff line
@@ -59,5 +59,7 @@ let WebrtcIndicator = { 
      streamData.browser.focus();

    }

    browserWindow.focus();

    PopupNotifications.getNotification("webRTC-sharingDevices",

                                       streamData.browser).reshow();

  }

}

browser/components/customizableui/content/panelUI.inc.xul

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ 
<panel id="widget-overflow"

       role="group"

       type="arrow"

       level="top"

       noautofocus="true"

       context="toolbar-context-menu"

       hidden="true">

  <vbox id="widget-overflow-scroller">

browser/components/customizableui/content/panelUI.js

+6 −0
Original line number Diff line number Diff line
@@ -133,6 +133,12 @@ const PanelUI = { 
        updateEditUIVisibility();

      }



      let personalBookmarksPlacement = CustomizableUI.getPlacementOfWidget("personal-bookmarks");

      if (personalBookmarksPlacement &&

          personalBookmarksPlacement.area == CustomizableUI.AREA_PANEL) {

        PlacesToolbarHelper.customizeChange();

      }



      let anchor;

      if (!aEvent ||

          aEvent.type == "command") {