Bug 1389566 - Remove @deprecated nsIBrowserBoxObject. r?bkelly
MozReview-Commit-ID: 7olN9TBFG5B
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -12,17 +12,16 @@ with Files('*Menu*'):
if CONFIG['ENABLE_TESTS']:
MOCHITEST_MANIFESTS += ['test/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
XPIDL_SOURCES += [
'nsIBoxObject.idl',
- 'nsIBrowserBoxObject.idl',
'nsIContainerBoxObject.idl',
'nsIListBoxObject.idl',
'nsIMenuBoxObject.idl',
'nsIScrollBoxObject.idl',
'nsISliderListener.idl',
]
XPIDL_MODULE = 'layout_xul'
deleted file mode 100644
--- a/layout/xul/nsIBrowserBoxObject.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "nsIContainerBoxObject.idl"
-
-/**
- * @deprecated Please consider using ContainerBoxObject.
- */
-
-[uuid(db436f2f-c656-4754-b0fa-99bc353bd63f)]
-interface nsIBrowserBoxObject : nsIContainerBoxObject
-{
-};
-
--- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
@@ -2,17 +2,16 @@
* vim: set ts=8 sw=4 et tw=78:
*
* 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 "ShimInterfaceInfo.h"
-#include "nsIBrowserBoxObject.h"
#include "nsIContainerBoxObject.h"
#include "nsIDOMAnimationEvent.h"
#include "nsIDOMAttr.h"
#include "nsIDOMBeforeUnloadEvent.h"
#include "nsIDOMCanvasRenderingContext2D.h"
#include "nsIDOMCDATASection.h"
#include "nsIDOMCharacterData.h"
#include "nsIDOMClientRect.h"
@@ -318,17 +317,16 @@ struct ComponentsInterfaceShimEntry {
* interface. Otherwise, use DEFINE_SHIM_WITH_CUSTOM_INTERFACE.
*/
const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
{
DEFINE_SHIM(AnimationEvent),
DEFINE_SHIM(Attr),
DEFINE_SHIM(BeforeUnloadEvent),
- DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIBrowserBoxObject, ContainerBoxObject),
DEFINE_SHIM(CanvasRenderingContext2D),
DEFINE_SHIM(CDATASection),
DEFINE_SHIM(CharacterData),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRect, DOMRectReadOnly),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMClientRectList, DOMRectList),
DEFINE_SHIM(ClipboardEvent),
DEFINE_SHIM(CommandEvent),
DEFINE_SHIM(Comment),