4 files changed, 3 insertions, 38 deletions
diff --git a/toolkit/components/browser/moz.build b/toolkit/components/browser/moz.build
index 903390a3c8..848c135afc 100644
--- a/toolkit/components/browser/moz.build
+++ b/toolkit/components/browser/moz.build
@@ -12,7 +12,6 @@ DIRS += ["build"]
 XPIDL_SOURCES += [
     "nsIWebBrowser.idl",
     "nsIWebBrowserChrome.idl",
-    "nsIWebBrowserChromeFocus.idl",
 ]
 
 XPIDL_SOURCES += [
diff --git a/toolkit/components/browser/nsIWebBrowser.idl b/toolkit/components/browser/nsIWebBrowser.idl
index a644dcd31e..40812ea429 100644
--- a/toolkit/components/browser/nsIWebBrowser.idl
+++ b/toolkit/components/browser/nsIWebBrowser.idl
@@ -38,7 +38,6 @@ interface nsIWebBrowser : nsISupports
      * window via the browser's <CODE>nsIBaseWindow</CODE> interface.
      *
      * The chrome may optionally implement <CODE>nsIInterfaceRequestor</CODE>,
-     * <CODE>nsIWebBrowserChromeFocus</CODE>,
      * <CODE>nsIContextMenuListener</CODE> and
      * <CODE>nsITooltipListener</CODE> to receive additional notifications
      * from the browser object.
@@ -57,7 +56,6 @@ interface nsIWebBrowser : nsISupports
      * @see nsIBaseWindow
      * @see nsIWebBrowserChrome
      * @see nsIInterfaceRequestor
-     * @see nsIWebBrowserChromeFocus
      * @see nsIContextMenuListener
      * @see nsITooltipListener
      * @see nsIWeakReference
diff --git a/toolkit/components/browser/nsIWebBrowserChrome.idl b/toolkit/components/browser/nsIWebBrowserChrome.idl
index 517c87a285..217beda78e 100644
--- a/toolkit/components/browser/nsIWebBrowserChrome.idl
+++ b/toolkit/components/browser/nsIWebBrowserChrome.idl
@@ -15,7 +15,7 @@ interface nsIDocShellTreeItem;
  * containing an embedded Gecko web browser.
  */
 
-[scriptable, uuid(E8C414C4-DC38-4BA3-AB4E-EC4CBBE22907)]
+[scriptable, builtinclass, uuid(E8C414C4-DC38-4BA3-AB4E-EC4CBBE22907)]
 interface nsIWebBrowserChrome : nsISupports
 {
     /**
@@ -124,7 +124,7 @@ interface nsIWebBrowserChrome : nsISupports
      *
      * @see nsIBaseWindow
      */
-    void setDimensions(in DimensionRequest aRequest);
+    [noscript] void setDimensions(in DimensionRequest aRequest);
 
     /**
      * Gets the dimensions of the window. The caller may pass
@@ -134,7 +134,7 @@ interface nsIWebBrowserChrome : nsISupports
      *
      * @see nsIBaseWindow
      */
-    void getDimensions(in DimensionKind aDimensionKind, out long aX, out long aY, out long aCX, out long aCY);
+    [noscript] void getDimensions(in DimensionKind aDimensionKind, out long aX, out long aY, out long aCX, out long aCY);
 
     /**
      * Blur the window. This should unfocus the window and send an onblur event.
diff --git a/toolkit/components/browser/nsIWebBrowserChromeFocus.idl b/toolkit/components/browser/nsIWebBrowserChromeFocus.idl
deleted file mode 100644
index 077ce39201..0000000000
--- a/toolkit/components/browser/nsIWebBrowserChromeFocus.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 0 -*-
- *
- * 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/. */
-
-#include "nsISupports.idl"
-
-/**
- * The nsIWebBrowserChromeFocus is implemented by the same object as the
- * nsIEmbeddingSiteWindow. It represents the focus up-calls from mozilla
- * to the embedding chrome. See mozilla bug #70224 for gratuitous info.
- */
-
-[scriptable, uuid(947B2EE6-51ED-4C2B-9F45-426C27CA84C6)]
-interface nsIWebBrowserChromeFocus : nsISupports
-{
-    /**
-     * Set the focus at the next focusable element in the chrome. If
-     * aForDocumentNavigation is true, this was a document navigation, so
-     * focus the parent window.
-     */
-
-    void focusNextElement(in boolean aForDocumentNavigation);
-
-    /**
-     * Set the focus at the previous focusable element in the chrome.
-     */
-
-    void focusPrevElement(in boolean aForDocumentNavigation);
-
-};