Bug 341092: Removing the "bookmarks toolbar widget" corrupts UI customizations, patch by Dave Townsend <mossop.bugzilla@blueprintit.co.uk>, r=me/annie.sullivan

browser/base/content/browser-places.js

@@ -613,15 +613,17 @@ var PlacesMenuDNDController = {
     bookmarksMenu.firstChild.hidePopupAndChildPopups();
 
     var bookmarksBar = document.getElementById("bookmarksBarContent");
-    // Close the overflow chevron menu and all its children
-    bookmarksBar._chevron.firstChild.hidePopupAndChildPopups();
-    
-    // Close all popups on the bookmarks toolbar
-    var toolbarItems = bookmarksBar.childNodes;
-    for (var i = 0; i < toolbarItems.length; ++i) {
-      var item = toolbarItems[i]
-      if (this._isContainer(item))
-        item.firstChild.hidePopupAndChildPopups();
+    if (bookmarksBar) {
+      // Close the overflow chevron menu and all its children
+      bookmarksBar._chevron.firstChild.hidePopupAndChildPopups();
+
+      // Close all popups on the bookmarks toolbar
+      var toolbarItems = bookmarksBar.childNodes;
+      for (var i = 0; i < toolbarItems.length; ++i) {
+        var item = toolbarItems[i]
+        if (this._isContainer(item))
+          item.firstChild.hidePopupAndChildPopups();
+      }
     }
   },
   

browser/base/content/browser.js

@@ -995,7 +995,8 @@ function delayedStartup()
           .controllers.appendController(BookmarksMenuController);
 #else
   var toolbar = document.getElementById("bookmarksBarContent");
-  toolbar._init();
+  if (toolbar)
+    toolbar._init();
   var menu = document.getElementById("bookmarksMenuPopup");
   menu._init();
   PlacesMenuDNDController.init();
@@ -3400,7 +3401,8 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
   }
 #else
   var bookmarksBar = document.getElementById("bookmarksBarContent");
-  bookmarksBar._init();
+  if (bookmarksBar)
+    bookmarksBar._init();
 #endif
 
 #ifndef TOOLBAR_CUSTOMIZATION_SHEET