# HG changeset patch

# User Wolfgang Rosenauer <wr@rosenauer.org>

# Parent  04d0a1058aef5d88bddfca8f37759d7abea4bd5b

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

--- a/browser/app/profile/firefox.js

+++ b/browser/app/profile/firefox.js

@@ -465,21 +465,17 @@ pref("browser.tabs.warnOnOpen", true);

 pref("browser.tabs.maxOpenBeforeWarn", 15);

 pref("browser.tabs.loadInBackground", true);

 pref("browser.tabs.opentabfor.middleclick", true);

 pref("browser.tabs.loadDivertedInBackground", false);

 pref("browser.tabs.loadBookmarksInBackground", false);

 pref("browser.tabs.loadBookmarksInTabs", false);

 pref("browser.tabs.tabClipWidth", 140);

 pref("browser.tabs.tabMinWidth", 76);

-#ifdef UNIX_BUT_NOT_MAC

-pref("browser.tabs.drawInTitlebar", false);

-#else

 pref("browser.tabs.drawInTitlebar", true);

-#endif

 // Offer additional drag space to the user. The drag space

 // will only be shown if browser.tabs.drawInTitlebar is true.

 pref("browser.tabs.extraDragSpace", false);

 // 0 - Disable the tabbar session restore button.

 // 1 - Enable the tabbar session restore button.

 // 2 - Control group. The tabbar session restore button is disabled,

diff --git a/browser/base/moz.build b/browser/base/moz.build

--- a/browser/base/moz.build

+++ b/browser/base/moz.build

@@ -52,15 +52,15 @@ BROWSER_CHROME_MANIFESTS += [

 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']

 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']

 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):

     DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):

+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):

     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):

     DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

 JAR_MANIFESTS += ['jar.mn']

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js

--- a/modules/libpref/init/all.js

+++ b/modules/libpref/init/all.js

@@ -4936,16 +4936,17 @@ pref("gfx.content.always-paint", false);

 pref("gfx.apitrace.enabled",false);

 #endif

 #ifdef MOZ_X11

 #ifdef MOZ_WIDGET_GTK

 pref("gfx.xrender.enabled",false);

 pref("widget.chrome.allow-gtk-dark-theme", false);

 pref("widget.content.allow-gtk-dark-theme", false);

+pref("widget.allow-client-side-decoration", false);

 #endif

 #endif

 pref("widget.window-transforms.disabled", false);

 #ifdef XP_WIN

 // Whether to disable the automatic detection and use of direct2d.

 pref("gfx.direct2d.disabled", false);

diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build

--- a/toolkit/modules/moz.build

+++ b/toolkit/modules/moz.build

@@ -254,17 +254,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco

 EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']

 EXTRA_JS_MODULES.sessionstore += [

     'sessionstore/PrivacyLevel.jsm',

     'sessionstore/SessionHistory.jsm',

     'sessionstore/Utils.jsm',

 ]

 DEFINES['INSTALL_COMPACT_THEMES'] = 1

-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):

+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa', 'gtk3'):

     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):

     DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):

     DEFINES['HAVE_SHELL_SERVICE'] = 1