diff -r 000000000000 -r 6474c204b198 content/xul/document/src/nsXULControllers.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/xul/document/src/nsXULControllers.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+/*
+
+  The XUL "controllers" object.
+
+*/
+
+#ifndef nsXULControllers_h__
+#define nsXULControllers_h__
+
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
+#include "nsWeakPtr.h"
+#include "nsIControllers.h"
+#include "nsCycleCollectionParticipant.h"
+
+/* non-XPCOM class for holding controllers and their IDs */
+class nsXULControllerData
+{
+public:
+                            nsXULControllerData(uint32_t inControllerID, nsIController* inController)
+                            : mControllerID(inControllerID)
+                            , mController(inController)
+                            {                            
+                            }
+
+                            ~nsXULControllerData() {}
+
+    uint32_t                GetControllerID()   { return mControllerID; }
+
+    nsresult                GetController(nsIController **outController)
+                            {
+                              NS_IF_ADDREF(*outController = mController);
+                              return NS_OK;
+                            }
+    
+    uint32_t                mControllerID;
+    nsCOMPtr<nsIController> mController;
+};
+
+
+nsresult NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+
+class nsXULControllers : public nsIControllers
+{
+public:
+    friend nsresult
+    NS_NewXULControllers(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+
+    NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+    NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXULControllers, nsIControllers)
+    NS_DECL_NSICONTROLLERS
+  
+protected:
+    nsXULControllers();
+    virtual ~nsXULControllers(void);
+
+    void        DeleteControllers();
+
+    nsTArray<nsXULControllerData*>   mControllers;
+    uint32_t                         mCurControllerID;
+};
+
+
+
+
+#endif // nsXULControllers_h__