diff --git a/mozilla/browser/base/resources/content/browser.js b/mozilla/browser/base/resources/content/browser.js
index 59a897f1b0f..bcbbb111724 100644
--- a/mozilla/browser/base/resources/content/browser.js
+++ b/mozilla/browser/base/resources/content/browser.js
@@ -49,7 +49,6 @@ var gSearchService = null;
var gNavigatorBundle;
var gNavigatorRegionBundle;
var gLastValidURLStr = "";
-var gLastValidURL = null;
var gHaveUpdatedToolbarState = false;
var gClickSelectsAll = -1;
@@ -85,13 +84,6 @@ const gButtonPrefListener =
button.setAttribute("hidden","false");
else
button.setAttribute("hidden", "true");
-
- // If all buttons before the separator are hidden, also hide the separator
- if (allLeftButtonsAreHidden())
- document.getElementById("home-bm-separator").setAttribute("hidden", "true");
- else
- document.getElementById("home-bm-separator").removeAttribute("hidden");
- }
};
const gTabStripPrefListener =
@@ -422,21 +414,6 @@ function UpdateBackForwardButtons()
}
}
-// Function allLeftButtonsAreHidden
-// Returns true if all the buttons left of the separator in the personal
-// toolbar are hidden, false otherwise.
-// Used by nsButtonPrefListener to hide the separator if needed
-function allLeftButtonsAreHidden()
-{
- var buttonNode = document.getElementById("PersonalToolbar").firstChild;
- while(buttonNode.tagName != "toolbarseparator") {
- if(!buttonNode.hasAttribute("hidden") || buttonNode.getAttribute("hidden") == "false")
- return false;
- buttonNode = buttonNode.nextSibling;
- }
- return true;
-}
-
function Startup()
{
// init globals
@@ -679,20 +656,6 @@ function Shutdown()
appCore.close();
}
-function Translate()
-{
- var service = pref.getCharPref("browser.translation.service");
- var serviceDomain = pref.getCharPref("browser.translation.serviceDomain");
- var targetURI = getWebNavigation().currentURI.spec;
-
- // if we're already viewing a translated page, then just reload
- if (targetURI.indexOf(serviceDomain) >= 0)
- BrowserReload();
- else {
- loadURI(service + escape(targetURI));
- }
-}
-
function gotoHistoryIndex(aEvent)
{
var index = aEvent.target.getAttribute("index");
@@ -2083,5 +2046,3 @@ function FillInHTMLTooltip(tipElement)
return retVal;
}
-
-
diff --git a/mozilla/browser/base/resources/content/browser.xul b/mozilla/browser/base/resources/content/browser.xul
index e24123da4c9..101418c40a8 100644
--- a/mozilla/browser/base/resources/content/browser.xul
+++ b/mozilla/browser/base/resources/content/browser.xul
@@ -494,7 +494,7 @@ Contributor(s): ______________________________________. -->
-
+