Dragging location bar to palette breaks toolbox. b=400872 r=gavin a=blocking-firefox3

browser/base/content/browser.js

@@ -3275,6 +3275,7 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
     gProxyFavIcon = document.getElementById("page-proxy-favicon");
     gProxyDeck = document.getElementById("page-proxy-deck");
     gHomeButton.updateTooltip();
+    gIdentityHandler._cacheElements();
     window.XULBrowserWindow.init();
   }
 
@@ -3454,8 +3455,10 @@ nsBrowserStatusHandler.prototype =
     this.urlBar                 = document.getElementById("urlbar");
     this.isImage                = document.getElementById("isImage");
 
-    // Initialize the security button's state and tooltip text
+    // Initialize the security button's state and tooltip text.  Remember to reset
+    // _hostChanged, otherwise onSecurityChange will short circuit.
     var securityUI = getBrowser().securityUI;
+    this._hostChanged = true;
     this.onSecurityChange(null, null, securityUI.state);
   },
 
@@ -5678,16 +5681,6 @@ BookmarkAllTabsHandler.prototype = {
  * Utility class to handle manipulations of the identity indicators in the UI
  */
 function IdentityHandler() {
-  this._identityPopup = document.getElementById("identity-popup");
-  this._identityBox = document.getElementById("identity-box");
-  this._identityPopupContentBox = document.getElementById("identity-popup-content-box");
-  this._identityPopupTitle = document.getElementById("identity-popup-title");
-  this._identityPopupContent = document.getElementById("identity-popup-content");
-  this._identityPopupContentSupp = document.getElementById("identity-popup-content-supplemental");
-  this._identityPopupContentVerif = document.getElementById("identity-popup-content-verifier");
-  this._identityPopupEncLabel = document.getElementById("identity-popup-encryption-label");
-  this._identityIconLabel = document.getElementById("identity-icon-label");
-
   this._stringBundle = document.getElementById("bundle_browser");
   this._staticStrings = {};
   this._staticStrings[this.IDENTITY_MODE_DOMAIN_VERIFIED] = {
@@ -5702,6 +5695,8 @@ function IdentityHandler() {
     title: this._stringBundle.getString("identity.unknown.title"),
     encryption_label: this._stringBundle.getString("identity.unencrypted")  
   };
+
+  this._cacheElements();
 }
 
 IdentityHandler.prototype = {
@@ -5715,6 +5710,21 @@ IdentityHandler.prototype = {
   _lastStatus : null,
   _lastHost : null,
 
+  /**
+   * Build out a cache of the elements that we need frequently.
+   */
+  _cacheElements : function() {
+    this._identityPopup = document.getElementById("identity-popup");
+    this._identityBox = document.getElementById("identity-box");
+    this._identityPopupContentBox = document.getElementById("identity-popup-content-box");
+    this._identityPopupTitle = document.getElementById("identity-popup-title");
+    this._identityPopupContent = document.getElementById("identity-popup-content");
+    this._identityPopupContentSupp = document.getElementById("identity-popup-content-supplemental");
+    this._identityPopupContentVerif = document.getElementById("identity-popup-content-verifier");
+    this._identityPopupEncLabel = document.getElementById("identity-popup-encryption-label");
+    this._identityIconLabel = document.getElementById("identity-icon-label");
+  },
+
   /**
    * Handler for mouseclicks on the "Tell me more about this website" link text
    * in the "identity-popup" panel.
@@ -5786,7 +5796,13 @@ IdentityHandler.prototype = {
    * IDENTITY_MODE_* constants.
    */
   setMode : function(newMode) {
-    document.getElementById("identity-box").className = newMode;
+    if (!this._identityBox) {
+      // No identity box means the identity box is not visible, in which
+      // case there's nothing to do.
+      return;
+    }
+
+    this._identityBox.className = newMode;
     this.setIdentityMessages(newMode);
     
     // Update the popup too, if it's open