diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-07 10:48:22 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-07 10:48:22 -0400 |
| commit | 03cf69df453c7d4e188259e4bfb7317e8e993a33 (patch) | |
| tree | a73a58ef995281154d6c182a3e353ab97bcea7dd /application/palemoon/base | |
| parent | ca9f588f3169be9601fae1f6aaf876c85cdf58cf (diff) | |
| download | UXP-03cf69df453c7d4e188259e4bfb7317e8e993a33.tar UXP-03cf69df453c7d4e188259e4bfb7317e8e993a33.tar.gz UXP-03cf69df453c7d4e188259e4bfb7317e8e993a33.tar.lz UXP-03cf69df453c7d4e188259e4bfb7317e8e993a33.tar.xz UXP-03cf69df453c7d4e188259e4bfb7317e8e993a33.zip | |
[PALEMOON] Finish incomplete ifdef'ing of MOZ_WEBRTC
Diffstat (limited to 'application/palemoon/base')
| -rw-r--r-- | application/palemoon/base/content/browser.js | 6 | ||||
| -rw-r--r-- | application/palemoon/base/content/browser.xul | 6 | ||||
| -rw-r--r-- | application/palemoon/base/content/popup-notifications.inc | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index ffb133963..328cc4975 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -153,7 +153,11 @@ let gInitialPages = [ #include browser-plugins.js #include browser-tabPreviews.js #include browser-thumbnails.js + +#ifdef MOZ_WEBRTC #include browser-webrtcUI.js +#endif + #include browser-gestureSupport.js #ifdef MOZ_SERVICES_SYNC @@ -1020,7 +1024,9 @@ var gBrowserInit = { OfflineApps.init(); IndexedDBPromptHelper.init(); AddonManager.addAddonListener(AddonsMgrListener); +#ifdef MOZ_WEBRTC WebrtcIndicator.init(); +#endif // Ensure login manager is up and running. Services.logins; diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index 3044ce675..30b1838ea 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -440,8 +440,10 @@ <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/> <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> +#ifdef MOZ_WEBRTC <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> +#endif <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> </box> @@ -513,7 +515,7 @@ flex="100" persist="width" removable="true"> <searchbar id="searchbar" flex="1"/> </toolbaritem> - +#ifdef MOZ_WEBRTC <toolbarbutton id="webrtc-status-button" class="toolbarbutton-1 chromeclass-toolbar-additional" type="menu" @@ -525,7 +527,7 @@ onpopuphiding="WebrtcIndicator.clearPopup(this);" oncommand="WebrtcIndicator.menuCommand(event.target);"/> </toolbarbutton> - +#endif <toolbarbutton id="bookmarks-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional" persist="class" diff --git a/application/palemoon/base/content/popup-notifications.inc b/application/palemoon/base/content/popup-notifications.inc index 04f4cb5b7..3112de597 100644 --- a/application/palemoon/base/content/popup-notifications.inc +++ b/application/palemoon/base/content/popup-notifications.inc @@ -54,7 +54,7 @@ </hbox> </panel> - +#ifdef MOZ_WEBRTC <popupnotification id="webRTC-shareDevices-notification" hidden="true"> <popupnotificationcontent id="webRTC-selectCamera" orient="vertical"> <separator class="thin"/> @@ -75,7 +75,7 @@ </menulist> </popupnotificationcontent> </popupnotification> - +#endif <popupnotification id="servicesInstall-notification" hidden="true"> <popupnotificationcontent orient="vertical" align="start"> <!-- XXX bug 974146, tests are looking for this, can't remove yet. --> |