diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 59ae27b77572..8b99a57a78f4 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6029,7 +6029,6 @@ function BrowserSetForcedCharacterSet(aCharset) function BrowserSetForcedDetector(doReload) { - gBrowser.docShell.forcedDetector = true; if (doReload) BrowserReloadWithFlags(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE); } diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index c84e62ce7d52..620c9bb28e8f 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -1896,18 +1896,6 @@ NS_IMETHODIMP nsDocShell::GetForcedCharset(nsIAtom ** aResult) return NS_OK; } -NS_IMETHODIMP nsDocShell::SetForcedDetector(bool aForced) -{ - // XXX write me - return NS_OK; -} - -NS_IMETHODIMP nsDocShell::GetForcedDetector(bool * aResult) -{ - // XXX write me - return NS_OK; -} - NS_IMETHODIMP nsDocShell::SetParentCharset(nsIAtom * aCharset) { mParentCharset = aCharset; diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl index 99019690d44c..b834360e3dd6 100644 --- a/docshell/base/nsIDocShell.idl +++ b/docshell/base/nsIDocShell.idl @@ -592,8 +592,6 @@ interface nsIDocShell : nsISupports */ attribute nsIAtom forcedCharset; - attribute boolean forcedDetector; - /** * In a child docshell, this is the charset of the parent docshell */ diff --git a/mobile/xul/chrome/content/bindings/browser.xml b/mobile/xul/chrome/content/bindings/browser.xml index d5b372882625..f0167168f439 100644 --- a/mobile/xul/chrome/content/bindings/browser.xml +++ b/mobile/xul/chrome/content/bindings/browser.xml @@ -654,7 +654,6 @@