diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js index 3a177b968055..b1a4e9240982 100644 --- a/browser/base/content/tabbrowser.js +++ b/browser/base/content/tabbrowser.js @@ -127,7 +127,7 @@ window._gBrowser = { _browserBindingProperties: [ "canGoBack", "canGoForward", "goBack", "goForward", "permitUnload", "reload", "reloadWithFlags", "stop", "loadURI", "loadURIWithFlags", - "goHome", "homePage", "gotoIndex", "currentURI", "documentURI", + "gotoIndex", "currentURI", "documentURI", "preferences", "imageDocument", "isRemoteBrowser", "messageManager", "getTabBrowser", "finder", "fastFind", "sessionHistory", "contentTitle", "characterSet", "fullZoom", "textZoom", "webProgress", @@ -368,23 +368,10 @@ window._gBrowser = { return this.selectedBrowser.loadURIWithFlags(aURI, aFlags, aReferrerURI, aCharset, aPostData); }, - goHome() { - return this.selectedBrowser.goHome(); - }, - gotoIndex(aIndex) { return this.selectedBrowser.gotoIndex(aIndex); }, - set homePage(val) { - this.selectedBrowser.homePage = val; - return val; - }, - - get homePage() { - return this.selectedBrowser.homePage; - }, - get currentURI() { return this.selectedBrowser.currentURI; }, diff --git a/layout/tools/layout-debug/ui/content/layoutdebug.js b/layout/tools/layout-debug/ui/content/layoutdebug.js index 646272ab89fc..7af097379a5e 100644 --- a/layout/tools/layout-debug/ui/content/layoutdebug.js +++ b/layout/tools/layout-debug/ui/content/layoutdebug.js @@ -113,7 +113,7 @@ function OnLDBLoad() if (window.arguments && window.arguments[0]) gBrowser.loadURI(window.arguments[0]); else - gBrowser.goHome(); + gBrowser.loadURI("about:blank"); gDebugger.init(gBrowser.contentWindow); diff --git a/layout/tools/layout-debug/ui/content/layoutdebug.xul b/layout/tools/layout-debug/ui/content/layoutdebug.xul index a7ab719ec546..2e2499c26cb4 100644 --- a/layout/tools/layout-debug/ui/content/layoutdebug.xul +++ b/layout/tools/layout-debug/ui/content/layoutdebug.xul @@ -112,8 +112,7 @@ - + diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml index 4b0f6d980a0f..7b8ed4e32b68 100644 --- a/toolkit/content/widgets/browser.xml +++ b/toolkit/content/widgets/browser.xml @@ -153,38 +153,6 @@ - - - - - - - - - - - - - - - diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index f4c60bde3fa0..306358c3e8a9 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -2110,7 +2110,6 @@ var gDiscoverView = { return; } - this._browser.homePage = this.homepageURL.spec; this._browser.addProgressListener(this); if (this.loaded) @@ -2169,7 +2168,7 @@ var gDiscoverView = { // and the error page is not visible then there is nothing else to do if (this.loaded && this.node.selectedPanel != this._error && (!aIsRefresh || (this._browser.currentURI && - this._browser.currentURI.spec == this._browser.homePage))) { + this._browser.currentURI.spec == this.homepageURL.spec))) { gViewController.notifyViewChanged(); return; } @@ -2189,7 +2188,7 @@ var gDiscoverView = { canRefresh() { if (this._browser.currentURI && - this._browser.currentURI.spec == this._browser.homePage) + this._browser.currentURI.spec == this.homepageURL.spec) return false; return true; }, diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index fe48788a3339..39c7fae59e9d 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -188,7 +188,7 @@ + disablehistory="true"/>