diff -r 000000000000 -r 6474c204b198 embedding/components/commandhandler/src/nsBaseCommandController.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/embedding/components/commandhandler/src/nsBaseCommandController.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,176 @@
+/* -*- 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 "nsString.h"
+#include "nsIComponentManager.h"
+#include "nsBaseCommandController.h"
+
+#include "nsString.h"
+#include "nsWeakPtr.h"
+
+NS_IMPL_ADDREF(nsBaseCommandController)
+NS_IMPL_RELEASE(nsBaseCommandController)
+
+NS_INTERFACE_MAP_BEGIN(nsBaseCommandController)
+  NS_INTERFACE_MAP_ENTRY(nsIController)
+  NS_INTERFACE_MAP_ENTRY(nsICommandController)
+  NS_INTERFACE_MAP_ENTRY(nsIControllerContext)
+  NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIControllerContext)
+NS_INTERFACE_MAP_END
+
+nsBaseCommandController::nsBaseCommandController()
+  : mCommandContextRawPtr(nullptr)
+{
+}
+
+nsBaseCommandController::~nsBaseCommandController()
+{
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::Init(nsIControllerCommandTable *aCommandTable)
+{
+  nsresult rv = NS_OK;
+
+  if (aCommandTable)
+    mCommandTable = aCommandTable;    // owning addref
+  else
+    mCommandTable = do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv);
+  
+  return rv;
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::SetCommandContext(nsISupports *aCommandContext)
+{
+  mCommandContextWeakPtr = nullptr;
+  mCommandContextRawPtr = nullptr;
+
+  if (aCommandContext) {
+    nsCOMPtr<nsISupportsWeakReference> weak = do_QueryInterface(aCommandContext);
+    if (weak) {
+      nsresult rv =
+        weak->GetWeakReference(getter_AddRefs(mCommandContextWeakPtr));
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+    else {
+      mCommandContextRawPtr = aCommandContext;
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::GetInterface(const nsIID & aIID, void * *result)
+{
+  NS_ENSURE_ARG_POINTER(result);
+
+  if (NS_SUCCEEDED(QueryInterface(aIID, result)))
+    return NS_OK;
+
+  if (aIID.Equals(NS_GET_IID(nsIControllerCommandTable)))
+  {
+    if (mCommandTable)
+      return mCommandTable->QueryInterface(aIID, result);
+    return NS_ERROR_NOT_INITIALIZED;
+  }
+    
+  return NS_NOINTERFACE;
+}
+
+
+
+/* =======================================================================
+ * nsIController
+ * ======================================================================= */
+
+NS_IMETHODIMP
+nsBaseCommandController::IsCommandEnabled(const char *aCommand,
+                                          bool *aResult)
+{
+  NS_ENSURE_ARG_POINTER(aCommand);
+  NS_ENSURE_ARG_POINTER(aResult);
+  NS_ENSURE_STATE(mCommandTable);
+
+  nsISupports* context = mCommandContextRawPtr;
+  nsCOMPtr<nsISupports> weak;
+  if (!context) {
+    weak = do_QueryReferent(mCommandContextWeakPtr);
+    context = weak;
+  }
+  return mCommandTable->IsCommandEnabled(aCommand, context, aResult);
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::SupportsCommand(const char *aCommand, bool *aResult)
+{
+  NS_ENSURE_ARG_POINTER(aCommand);
+  NS_ENSURE_ARG_POINTER(aResult);
+  NS_ENSURE_STATE(mCommandTable);
+
+  nsISupports* context = mCommandContextRawPtr;
+  nsCOMPtr<nsISupports> weak;
+  if (!context) {
+    weak = do_QueryReferent(mCommandContextWeakPtr);
+    context = weak;
+  }
+  return mCommandTable->SupportsCommand(aCommand, context, aResult);
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::DoCommand(const char *aCommand)
+{
+  NS_ENSURE_ARG_POINTER(aCommand);
+  NS_ENSURE_STATE(mCommandTable);
+
+  nsISupports* context = mCommandContextRawPtr;
+  nsCOMPtr<nsISupports> weak;
+  if (!context) {
+    weak = do_QueryReferent(mCommandContextWeakPtr);
+    context = weak;
+  }
+  return mCommandTable->DoCommand(aCommand, context);
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::DoCommandWithParams(const char *aCommand,
+                                             nsICommandParams *aParams)
+{
+  NS_ENSURE_ARG_POINTER(aCommand);
+  NS_ENSURE_STATE(mCommandTable);
+
+  nsISupports* context = mCommandContextRawPtr;
+  nsCOMPtr<nsISupports> weak;
+  if (!context) {
+    weak = do_QueryReferent(mCommandContextWeakPtr);
+    context = weak;
+  }
+  return mCommandTable->DoCommandParams(aCommand, aParams, context);
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::GetCommandStateWithParams(const char *aCommand,
+                                                   nsICommandParams *aParams)
+{
+  NS_ENSURE_ARG_POINTER(aCommand);
+  NS_ENSURE_STATE(mCommandTable);
+
+  nsISupports* context = mCommandContextRawPtr;
+  nsCOMPtr<nsISupports> weak;
+  if (!context) {
+    weak = do_QueryReferent(mCommandContextWeakPtr);
+    context = weak;
+  }
+  return mCommandTable->GetCommandState(aCommand, aParams, context);
+}
+
+NS_IMETHODIMP
+nsBaseCommandController::OnEvent(const char * aEventName)
+{
+  NS_ENSURE_ARG_POINTER(aEventName);
+  return NS_OK;
+}