diff options
Diffstat (limited to 'toolkit/modules')
| -rw-r--r-- | toolkit/modules/AppConstants.jsm | 9 | ||||
| -rw-r--r-- | toolkit/modules/LightweightThemeConsumer.jsm | 2 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 3 |
3 files changed, 2 insertions, 12 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 41b398efc1..5eea04b0fb 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -194,13 +194,6 @@ MOZ_SAFE_BROWSING: false, #endif - MOZ_REQUIRE_SIGNING: -#ifdef MOZ_REQUIRE_SIGNING - true, -#else - false, -#endif - MENUBAR_CAN_AUTOHIDE: #ifdef MENUBAR_CAN_AUTOHIDE true, @@ -209,7 +202,7 @@ MOZ_SAFE_BROWSING: #endif CAN_DRAW_IN_TITLEBAR: -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR true, #else false, diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm index 325f711b78..4010a9ff22 100644 --- a/toolkit/modules/LightweightThemeConsumer.jsm +++ b/toolkit/modules/LightweightThemeConsumer.jsm @@ -147,7 +147,7 @@ LightweightThemeConsumer.prototype = { footer.removeAttribute("lwthemefooter"); } -#ifdef XP_MACOSX +#if defined(XP_MACOSX) && defined(MOZ_CAN_DRAW_IN_TITLEBAR) // On OS X, we extend the lightweight theme into the titlebar, which means setting // the chromemargin attribute. Some XUL applications already draw in the titlebar, // so we need to save the chromemargin value before we overwrite it with the value diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 8a364df8c2..54adae4cf6 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -92,9 +92,6 @@ EXTRA_PP_JS_MODULES += [ 'WindowDraggingUtils.jsm', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): - DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 |