diff -r 000000000000 -r 6474c204b198 toolkit/components/remote/nsGTKRemoteService.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/remote/nsGTKRemoteService.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=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/. */
+
+#ifndef __nsGTKRemoteService_h__
+#define __nsGTKRemoteService_h__
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
+#include "nsInterfaceHashtable.h"
+#include "nsXRemoteService.h"
+#include "mozilla/Attributes.h"
+
+class nsGTKRemoteService MOZ_FINAL : public nsXRemoteService
+{
+public:
+  // We will be a static singleton, so don't use the ordinary methods.
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIREMOTESERVICE
+
+
+  nsGTKRemoteService() :
+    mServerWindow(nullptr) { }
+
+private:
+  ~nsGTKRemoteService() { }
+
+  void HandleCommandsFor(GtkWidget* aWidget,
+                         nsIWeakReference* aWindow);
+
+
+  static PLDHashOperator StartupHandler(GtkWidget* aKey,
+                                        nsIWeakReference* aData,
+                                        void* aClosure);
+
+
+  static gboolean HandlePropertyChange(GtkWidget *widget,
+                                       GdkEventProperty *event,
+                                       nsIWeakReference* aThis);
+
+
+  virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
+                                              uint32_t aTimestamp);
+
+  nsInterfaceHashtable<nsPtrHashKey<GtkWidget>, nsIWeakReference> mWindows;
+  GtkWidget* mServerWindow;  
+};
+
+#endif // __nsGTKRemoteService_h__