diff -r 000000000000 -r 6474c204b198 widget/gtk/nsGTKToolkit.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/widget/gtk/nsGTKToolkit.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=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/. */
+
+#ifndef GTKTOOLKIT_H      
+#define GTKTOOLKIT_H
+
+#include "nsString.h"
+#include <gtk/gtk.h>
+
+/**
+ * Wrapper around the thread running the message pump.
+ * The toolkit abstraction is necessary because the message pump must
+ * execute within the same thread that created the widget under Win32.
+ */ 
+
+class nsGTKToolkit
+{
+public:
+    nsGTKToolkit();
+
+    static nsGTKToolkit* GetToolkit();
+
+    static void Shutdown() {
+      delete gToolkit;
+      gToolkit = nullptr;
+    }
+
+    /**
+     * Get/set our value of DESKTOP_STARTUP_ID. When non-empty, this is applied
+     * to the next toplevel window to be shown or focused (and then immediately
+     * cleared).
+     */ 
+    void SetDesktopStartupID(const nsACString& aID) { mDesktopStartupID = aID; }
+    void GetDesktopStartupID(nsACString* aID) { *aID = mDesktopStartupID; }
+
+    /**
+     * Get/set the timestamp value to be used, if non-zero, to focus the
+     * next top-level window to be shown or focused (upon which it is cleared).
+     */
+    void SetFocusTimestamp(uint32_t aTimestamp) { mFocusTimestamp = aTimestamp; }
+    uint32_t GetFocusTimestamp() { return mFocusTimestamp; }
+
+private:
+    static nsGTKToolkit* gToolkit;
+
+    nsCString      mDesktopStartupID;
+    uint32_t       mFocusTimestamp;
+};
+
+#endif  // GTKTOOLKIT_H