summaryrefslogtreecommitdiffstats
path: root/browser
diff options
context:
space:
mode:
Diffstat (limited to 'browser')
-rw-r--r--browser/base/content/browser-media.js15
-rwxr-xr-xbrowser/base/content/browser.js8
-rw-r--r--browser/base/content/browser.xul2
-rw-r--r--browser/base/content/tabbrowser.xml19
-rw-r--r--browser/base/content/win6BrowserOverlay.xul12
-rw-r--r--browser/base/jar.mn6
-rw-r--r--browser/components/customizableui/CustomizableUI.jsm14
-rw-r--r--browser/locales/en-US/chrome/browser/browser.properties3
8 files changed, 3 insertions, 76 deletions
diff --git a/browser/base/content/browser-media.js b/browser/base/content/browser-media.js
index 81e7faf17..a013dbd8a 100644
--- a/browser/base/content/browser-media.js
+++ b/browser/base/content/browser-media.js
@@ -201,29 +201,16 @@ let gDecoderDoctorHandler = {
getLabelForNotificationBox(type) {
if (type == "adobe-cdm-not-found" &&
AppConstants.platform == "win") {
- if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) {
- // We supply our own Learn More button so we don't need to populate the message here.
- return gNavigatorBundle.getFormattedString("emeNotifications.drmContentDisabled.message", [""]);
- }
return gNavigatorBundle.getString("decoder.noCodecs.message");
}
if (type == "adobe-cdm-not-activated" &&
AppConstants.platform == "win") {
- if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) {
- return gNavigatorBundle.getString("decoder.noCodecsXP.message");
- }
- if (!AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) {
- return gNavigatorBundle.getString("decoder.noCodecsVista.message");
- }
return gNavigatorBundle.getString("decoder.noCodecs.message");
}
if (type == "platform-decoder-not-found") {
- if (AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) {
+ if (AppConstants.platform == "win") {
return gNavigatorBundle.getString("decoder.noHWAcceleration.message");
}
- if (AppConstants.isPlatformAndVersionAtLeast("win", "6")) {
- return gNavigatorBundle.getString("decoder.noHWAccelerationVista.message");
- }
if (AppConstants.platform == "linux") {
return gNavigatorBundle.getString("decoder.noCodecsLinux.message");
}
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9ccd86b12..910dc4f68 100755
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -97,11 +97,6 @@ XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", function() {
return new scope.CustomizeMode(window);
});
-XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
- // Only show resizers on Windows 2000 and XP
- return AppConstants.isPlatformAndVersionAtMost("win", "5.9");
-});
-
XPCOMUtils.defineLazyGetter(this, "gPrefService", function() {
return Services.prefs;
});
@@ -3372,8 +3367,6 @@ var PrintPreviewListener = {
this._chromeState.notificationsOpen = !notificationBox.notificationsHidden;
notificationBox.notificationsHidden = true;
- gBrowser.updateWindowResizers();
-
this._chromeState.findOpen = gFindBarInitialized && !gFindBar.hidden;
if (gFindBarInitialized)
gFindBar.close();
@@ -5222,7 +5215,6 @@ function setToolbarVisibility(toolbar, isVisible, persist=true) {
PlacesToolbarHelper.init();
BookmarkingUI.onToolbarVisibilityChange();
- gBrowser.updateWindowResizers();
if (isVisible)
ToolbarIconColor.inferFromText();
}
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2c74aecdf..be17fb0e2 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -546,10 +546,8 @@
#ifdef MENUBAR_CAN_AUTOHIDE
toolbarname="&menubarCmd.label;"
accesskey="&menubarCmd.accesskey;"
-#if defined(MOZ_WIDGET_GTK)
autohide="true"
#endif
-#endif
context="toolbar-context-menu">
<toolbaritem id="menubar-items" align="center">
# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 3f4c3518e..0cb0f3bd6 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -214,18 +214,6 @@
]]></body>
</method>
- <method name="updateWindowResizers">
- <body><![CDATA[
- if (!window.gShowPageResizers)
- return;
-
- var show = window.windowState == window.STATE_NORMAL;
- for (let i = 0; i < this.browsers.length; i++) {
- this.browsers[i].showWindowResizer = show;
- }
- ]]></body>
- </method>
-
<method name="_setCloseKeyState">
<parameter name="aEnabled"/>
<body><![CDATA[
@@ -1970,10 +1958,6 @@
b.QueryInterface(Ci.nsIFrameLoaderOwner).presetOpenerWindow(aParams.opener);
}
- if (window.gShowPageResizers && window.windowState == window.STATE_NORMAL) {
- b.setAttribute("showresizer", "true");
- }
-
if (!aParams.isPreloadBrowser && this.hasAttribute("autocompletepopup")) {
b.setAttribute("autocompletepopup", this.getAttribute("autocompletepopup"));
}
@@ -4835,7 +4819,6 @@
this.appendChild(this._autoScrollPopup);
this.mCurrentBrowser.setAttribute("autoscrollpopup", this._autoScrollPopup.id);
this.mCurrentBrowser.droppedLinkHandler = handleDroppedLink;
- this.updateWindowResizers();
// Hook up the event listeners to the first browser
var tabListener = this.mTabProgressListener(this.mCurrentTab, this.mCurrentBrowser, true, false);
@@ -5854,8 +5837,6 @@
this._handleTabSelect();
this.mTabstripWidth = width;
}
-
- this.tabbrowser.updateWindowResizers();
break;
case "mouseout":
// If the "related target" (the node to which the pointer went) is not
diff --git a/browser/base/content/win6BrowserOverlay.xul b/browser/base/content/win6BrowserOverlay.xul
deleted file mode 100644
index a69e3f6bd..000000000
--- a/browser/base/content/win6BrowserOverlay.xul
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- -*- Mode: HTML -*- -->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<overlay id="win6-browser-overlay"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <toolbar id="toolbar-menubar"
- autohide="true"/>
-</overlay>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 60f1facc0..3fa5ea408 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -8,9 +8,6 @@ browser.jar:
% overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
% overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul
#endif
-#ifdef XP_WIN
-% overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6
-#endif
% overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
% overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
@@ -186,9 +183,6 @@ browser.jar:
* content/browser/webrtcIndicator.xul (content/webrtcIndicator.xul)
content/browser/webrtcIndicator.js (content/webrtcIndicator.js)
#endif
-#ifdef XP_WIN
- content/browser/win6BrowserOverlay.xul (content/win6BrowserOverlay.xul)
-#endif
# the following files are browser-specific overrides
* content/browser/license.html (/toolkit/content/license.html)
% override chrome://global/content/license.html chrome://browser/content/license.html
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
index 86ff2708b..01389108d 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -262,24 +262,14 @@ var CustomizableUIInternal = {
defaultCollapsed: false,
}, true);
- if (AppConstants.platform != "macosx") {
+ if (AppConstants.MENUBAR_CAN_AUTOHIDE) {
this.registerArea(CustomizableUI.AREA_MENUBAR, {
legacy: true,
type: CustomizableUI.TYPE_TOOLBAR,
defaultPlacements: [
"menubar-items",
],
- get defaultCollapsed() {
- if (AppConstants.MENUBAR_CAN_AUTOHIDE) {
- if (AppConstants.platform == "linux") {
- return true;
- }
- // This is duplicated logic from /browser/base/jar.mn
- // for win6BrowserOverlay.xul.
- return AppConstants.isPlatformAndVersionAtLeast("win", 6);
- }
- return false;
- }
+ defaultCollapsed: true,
}, true);
}
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 1947a3c90..6f3aab397 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -731,11 +731,8 @@ pendingCrashReports.alwaysSend = Always Send
decoder.noCodecs.button = Learn how
decoder.noCodecs.accesskey = L
decoder.noCodecs.message = To play video, you may need to install Microsoft’s Media Feature Pack.
-decoder.noCodecsVista.message = To play video, you may need to install Microsoft’s Platform Update Supplement for Windows Vista.
-decoder.noCodecsXP.message = To play video, you may need to enable Adobe’s Primetime Content Decryption Module.
decoder.noCodecsLinux.message = To play video, you may need to install the required video codecs.
decoder.noHWAcceleration.message = To improve video quality, you may need to install Microsoft’s Media Feature Pack.
-decoder.noHWAccelerationVista.message = To improve video quality, you may need to install Microsoft’s Platform Update Supplement for Windows Vista.
decoder.noPulseAudio.message = To play audio, you may need to install the required PulseAudio software.
decoder.unsupportedLibavcodec.message = libavcodec may be vulnerable or is not supported, and should be updated to play video.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 03:33:21 +0000