Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 36 insertions, 0 deletions

diff --git a/application/basilisk/components/shell/nsGNOMEShellService.h b/application/basilisk/components/shell/nsGNOMEShellService.h
new file mode 100644
index 000000000..a7b003802
--- /dev/null
+++ b/application/basilisk/components/shell/nsGNOMEShellService.h
@@ -0,0 +1,36 @@
+/* -*- 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/. */
+
+#ifndef nsgnomeshellservice_h____
+#define nsgnomeshellservice_h____
+
+#include "nsIGNOMEShellService.h"
+#include "nsStringAPI.h"
+#include "mozilla/Attributes.h"
+
+class nsGNOMEShellService final : public nsIGNOMEShellService
+{
+public:
+  nsGNOMEShellService() : mAppIsInPath(false) { }
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHELLSERVICE
+  NS_DECL_NSIGNOMESHELLSERVICE
+
+  nsresult Init();
+
+private:
+  ~nsGNOMEShellService() {}
+
+  bool KeyMatchesAppName(const char *aKeyValue) const;
+  bool CheckHandlerMatchesAppName(const nsACString& handler) const;
+
+  bool GetAppPathFromLauncher();
+  bool mUseLocaleFilenames;
+  nsCString    mAppPath;
+  bool mAppIsInPath;
+};
+
+#endif // nsgnomeshellservice_h____