Verified Commit d885d270 authored by Dan Ballard's avatar Dan Ballard Committed by Pier Angelo Vendrame
Browse files

Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and... 

Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac
parent b311fefd

browser/base/content/browser-menubar.inc

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ 
                <menuitem id="menu_savePage"

                          key="key_savePage"

                          command="Browser:SavePage" data-l10n-id="menu-file-save-page"/>

#ifndef XP_MACOSX

# bug 41117 - don't allow sharing as there is a proxy bypass theoretical risk, so restore send link in that case

#if !defined(XP_MACOSX) || defined(MOZ_PROXY_BYPASS_PROTECTION)

                <menuitem id="menu_sendLink"

                          command="Browser:SendLink" data-l10n-id="menu-file-email-link"/>

#endif

browser/base/content/browser.js

+4 −0
Original line number Diff line number Diff line
@@ -4807,6 +4807,10 @@ let gShareUtils = { 
   * Updates a sharing item in a given menu, creating it if necessary.

   */

  updateShareURLMenuItem(browser, insertAfterEl) {

    if (!Services.prefs.getBoolPref("browser.share_menu.allow", false)) {

      return false;

    }



    // We only support "share URL" on macOS and on Windows 10:

    if (

      AppConstants.platform != "macosx" &&