Commit 6eb855a3 authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Georg Koppen
Browse files

Bug 18884: Add --disable-loop flag 

When a mozconfig file contains
  ac_add_options --disable-loop

then the Loop extension will not be built or bundled with the browser.
parent cc1e9fbd

browser/base/content/browser.css

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
%endif

}



%ifdef MOZ_LOOP

/* These values are chosen to keep the Loop detached chat window from

 * getting too small.  When it's too small, three bad things happen:

 *
@@ -41,6 +42,7 @@ 
  min-width: 260px;

  min-height: 315px;

}

%endif



#main-window[customize-entered] {

  min-width: -moz-fit-content;
@@ -914,6 +916,7 @@ chatbox[customSize] { 
  min-width: 350px;

}



%ifdef MOZ_LOOP

chatbox[customSize="loopChatEnabled"] {

  /* 430px as defined per UX */

  height: 430px;
@@ -938,6 +941,7 @@ chatbox[customSize="loopChatDisabledMessageAppended"] { 
  /* 445px + 30px top bar height. */

  min-height: calc(400px + 30px);

}

%endif



chatbox[minimized="true"] {

  width: 160px;

browser/base/content/browser.xul

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ 
           noautofocus="true"

           position="topcenter topright"/>



#ifdef MOZ_LOOP

    <panel id="loop-notification-panel"

           class="loop-panel social-panel"

           type="arrow"
@@ -301,6 +302,7 @@ 
           type="arrow"

           orient="horizontal"

           hidden="true"/>

#endif



    <menupopup id="toolbar-context-menu"

               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">

browser/components/about/AboutRedirector.cpp

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static RedirEntry kRedirMap[] = { 
  {

    "debugging", "chrome://devtools/content/aboutdebugging/aboutdebugging.xhtml",

    nsIAboutModule::ALLOW_SCRIPT },

#ifdef MOZ_LOOP

  { "loopconversation", "chrome://loop/content/panels/conversation.html",

    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

    nsIAboutModule::ALLOW_SCRIPT |
@@ -120,6 +121,7 @@ static RedirEntry kRedirMap[] = { 
    nsIAboutModule::ENABLE_INDEXED_DB,

    // Shares an IndexedDB origin with about:loopconversation.

    "loopconversation" },

#endif

  { "reader", "chrome://global/content/reader/aboutReader.html",

    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

    nsIAboutModule::ALLOW_SCRIPT |

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

+2 −0
Original line number Diff line number Diff line
@@ -243,7 +243,9 @@ 


    <panelview id="PanelUI-socialapi" flex="1"/>



#ifdef MOZ_LOOP

    <panelview id="PanelUI-loopapi" flex="1"/>

#endif



    <panelview id="PanelUI-feeds" flex="1" oncommand="FeedHandler.subscribeToFeed(null, event);">

      <label value="&feedsMenu.label;" class="panel-subview-header"/>

browser/extensions/moz.build

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
# file, You can obtain one at http://mozilla.org/MPL/2.0/.



DIRS += [

    'loop',

    'pdfjs',

]



if CONFIG['MOZ_LOOP']:

    DIRS += ['loop']