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

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

1 files changed, 17 insertions, 0 deletions

diff --git a/application/basilisk/base/content/browser-tabsintitlebar-stub.js b/application/basilisk/base/content/browser-tabsintitlebar-stub.js
new file mode 100644
index 000000000..1e45b17dd
--- /dev/null
+++ b/application/basilisk/base/content/browser-tabsintitlebar-stub.js
@@ -0,0 +1,17 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 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/. */
+
+// This file is used as a stub object for platforms which
+// don't have CAN_DRAW_IN_TITLEBAR defined.
+
+var TabsInTitlebar = {
+  init: function () {},
+  uninit: function () {},
+  allowedBy: function (condition, allow) {},
+  updateAppearance: function updateAppearance(aForce) {},
+  get enabled() {
+    return document.documentElement.getAttribute("tabsintitlebar") == "true";
+  },
+};