From 176fca41129b7dc7351fed764dc11b7d901b765e Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Fri, 17 Jun 2011 18:47:43 +0200
Subject: [PATCH] Bug 664669 - tab._tabViewTabIsRemovedAfterRestore should be
 attached to the tabItem rather than the xulTab; r=dao

---
 browser/base/content/browser-tabview.js | 4 ++--
 browser/base/content/tabview/ui.js      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index 2ee63ef63631..35ffb01fabba 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -368,8 +368,8 @@ let TabView = {
     if (this._window) {
       this._window.UI.restoredClosedTab = true;
 
-      if (blankTabToRemove)
-        blankTabToRemove._tabViewTabIsRemovedAfterRestore = true;
+      if (blankTabToRemove && blankTabToRemove._tabViewTabItem)
+        blankTabToRemove._tabViewTabItem.isRemovedAfterRestore = true;
     }
   },
 
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index 0201fc6082ac..9dacb71cda9e 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -763,8 +763,9 @@ let UI = {
           // 3) When a blank tab is active while restoring a closed tab the
           // blank tab gets removed. The active group is not closed as this is
           // where the restored tab goes. So do not show the TabView.
+          let tabItem = tab && tab._tabViewTabItem;
           let closingBlankTabAfterRestore =
-            (tab && tab._tabViewTabIsRemovedAfterRestore);
+            (tabItem && tabItem.isRemovedAfterRestore);
 
           if ((closingLastOfGroup || closingUnnamedGroup) &&
               !closingBlankTabAfterRestore) {