Bug 726560 - v4: commenting, let it undefined in gecko 1.x

xabolcs · Mar 20, 2012 · e11907e · e11907e
1 parent 5e5edaf
commit e11907e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/extension/chrome/content/browser.js b/extension/chrome/content/browser.js
@@ -52,9 +52,11 @@ get tabTitle() {
 },
 
 get tabGroupTitle() {
-  if (typeof(nightlyApp.getTabGroupTitle) === "function")
+  try 
+  {
     return nightlyApp.getTabGroupTitle(window);
-  return "";
+  } 
+  catch (e) { }
 },
 
 init: function()

diff --git a/extension/modules/tabGroupTitle.jsm b/extension/modules/tabGroupTitle.jsm
@@ -9,7 +9,7 @@ let sstore = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionS
 
 
 /**
- * Simply retrieves the active tabgroup's title from sessionStore
+ * Simply retrieves the active tabgroup's title from SessionStore
  */
 function getActiveGroupName(win) {
   let data = "", groupTitle = "";
@@ -34,15 +34,15 @@ function getActiveGroupName(win) {
  *
  * In Gecko 1.x title is set to "Undefined" as in other Apps
  * Before FF10 title is managed by TabView
- * After that we manages the title: SessionStore to load and save, borrowed code to generate
+ * After that we manages the title: using SessionStore and other borrowed code to generate
  */
 function getTabGroupTitle(win) {
   let nightlyApp = win.nightlyApp;
   let TabView = win.TabView;
 
   // TabView isn't implemented
   if (!("TabView" in win))
-    return "";
+    return;
 
   // If we are before Bug 682996, 
   // use TabView's own implementation except it is null