summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-28 13:20:53 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-28 13:20:53 -0400
commitddea4710991d889a1c049835442a15fed026de9e (patch)
tree90197888b5acf4b4810bbebce79d8752e4306bd8
parent8efb8f608f4da9bf7f728e1ec2f597a2900be109 (diff)
downloadUXP-ddea4710991d889a1c049835442a15fed026de9e.tar
UXP-ddea4710991d889a1c049835442a15fed026de9e.tar.gz
UXP-ddea4710991d889a1c049835442a15fed026de9e.tar.lz
UXP-ddea4710991d889a1c049835442a15fed026de9e.tar.xz
UXP-ddea4710991d889a1c049835442a15fed026de9e.zip
Use MOZ_AUSTRALIS to define common shared Australis features
-rw-r--r--application/basilisk/configure.in3
-rw-r--r--application/basilisk/confvars.sh1
-rw-r--r--devtools/client/framework/devtools-browser.js12
-rw-r--r--toolkit/themes/linux/global/global.css2
-rw-r--r--toolkit/themes/windows/global/global.css2
5 files changed, 12 insertions, 8 deletions
diff --git a/application/basilisk/configure.in b/application/basilisk/configure.in
index 9638c1e4d..8527d218c 100644
--- a/application/basilisk/configure.in
+++ b/application/basilisk/configure.in
@@ -8,6 +8,9 @@ dnl Things we need to carry from confvars.sh
AC_DEFINE(MOZ_PHOENIX)
AC_SUBST(MOZ_PHOENIX)
+AC_DEFINE(MOZ_AUSTRALIS)
+AC_SUBST(MOZ_AUSTRALIS)
+
AC_DEFINE(MC_BASILISK)
AC_SUBST(MC_BASILISK)
diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh
index 0343034a4..48985f16a 100644
--- a/application/basilisk/confvars.sh
+++ b/application/basilisk/confvars.sh
@@ -6,6 +6,7 @@
MOZ_APP_BASENAME=Basilisk
MOZ_APP_VENDOR=Moonchild
MOZ_PHOENIX=1
+MOZ_AUSTRALIS=1
MC_BASILISK=1
MOZ_UPDATER=1
diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js
index f032f82aa..4d7176b4c 100644
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@@ -28,7 +28,7 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main",
loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus");
loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm");
#endif
@@ -335,7 +335,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
* Install Developer widget
*/
installDeveloperWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
let id = "developer-button";
let widget = CustomizableUI.getWidget(id);
if (widget && widget.provider == CustomizableUI.PROVIDER_API) {
@@ -394,7 +394,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
*/
// Used by itself
installWebIDEWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
if (this.isWebIDEWidgetInstalled()) {
return;
}
@@ -422,7 +422,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
},
isWebIDEWidgetInstalled: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
let widgetWrapper = CustomizableUI.getWidget("webide-button");
return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
#else
@@ -439,7 +439,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
* Uninstall WebIDE widget
*/
uninstallWebIDEWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
if (this.isWebIDEWidgetInstalled()) {
CustomizableUI.removeWidgetFromArea("webide-button");
}
@@ -454,7 +454,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
*/
// Used by webide.js
moveWebIDEWidgetInNavbar: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR);
#else
return;
diff --git a/toolkit/themes/linux/global/global.css b/toolkit/themes/linux/global/global.css
index 9553725d6..9328f7a66 100644
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -316,7 +316,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
-%ifdef MC_BASILISK
+%ifdef MOZ_AUSTRALIS
.close-icon {
-moz-appearance: none;
height: 16px;
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index 416321041..6b6a21ca3 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -331,7 +331,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
-%ifdef MC_BASILISK
+%ifdef MOZ_AUSTRALIS
.close-icon {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 20px, 20px, 0);