From 90ed48aad7bbd98b8c260f22d986a830e504e2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 26 Jul 2012 15:27:32 +0200
Subject: [PATCH] Bug 776773 - put tabs in the title bar before updating the
 tab strip. r=ttaubert

---
 browser/base/content/browser.js     | 10 ++--------
 browser/base/content/tabbrowser.xml |  6 ++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 15effd3efe66..1966dbed7d73 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4681,15 +4681,9 @@ var TabsInTitlebar = {
     this._readPref();
     Services.prefs.addObserver(this._prefName, this, false);
 
-    // Don't trust the initial value of the sizemode attribute; wait for the resize event.
+    // Don't trust the initial value of the sizemode attribute; wait for
+    // the resize event (handled in tabbrowser.xml).
     this.allowedBy("sizemode", false);
-    window.addEventListener("resize", function (event) {
-      if (event.target != window)
-        return;
-      let sizemode = document.documentElement.getAttribute("sizemode");
-      TabsInTitlebar.allowedBy("sizemode",
-                               sizemode == "maximized" || sizemode == "fullscreen");
-    }, false);
 
     this._initialized = true;
 #endif
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 82486faccdfe..2ec0013a7131 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -3092,6 +3092,11 @@
             case "resize":
               if (aEvent.target != window)
                 break;
+
+              let sizemode = document.documentElement.getAttribute("sizemode");
+              TabsInTitlebar.allowedBy("sizemode",
+                                       sizemode == "maximized" || sizemode == "fullscreen");
+
               var width = this.mTabstrip.boxObject.width;
               if (width != this.mTabstripWidth) {
                 this.adjustTabstrip();
@@ -3099,6 +3104,7 @@
                 this._handleTabSelect();
                 this.mTabstripWidth = width;
               }
+
               this.tabbrowser.updateWindowResizers();
               break;
             case "mouseout":