Bug 288254 - Findbar XBL widget. r=gavin,masayuki,bienvenu.

2006-11-26 22:47:46 +00:00 · 2006-11-26 22:47:46 +00:00 · 015f043c53
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@ -9,8 +9,6 @@
 %globalRegionDTD;
 <!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
 %charsetDTD;
-<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
-%findBarDTD;
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
 %textcontextDTD;
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@ -47,7 +47,6 @@
  <stringbundleset id="stringbundleset"> 
    <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
    <stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
-    <stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
    <stringbundle id="bundle_preferences" src="chrome://browser/locale/preferences/preferences.properties"/>
 #ifdef MOZ_PLACES
    <stringbundle id="placeBundle" src="chrome://browser/locale/places/places.properties"/>
@ -136,9 +135,15 @@
    <command id="View:PageSource" oncommand="BrowserViewSourceOfDocument(content.document);" observes="isImage"/>
    <command id="View:PageInfo" oncommand="BrowserPageInfo();"/>
    <command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
-    <command id="cmd_find" oncommand="gFindBar.onFindCmd();" observes="isImage"/>
-    <command id="cmd_findAgain" oncommand="gFindBar.onFindAgainCmd(false);" observes="isImage"/>
-    <command id="cmd_findPrevious" oncommand="gFindBar.onFindAgainCmd(true);" observes="isImage"/>
+    <command id="cmd_find"
+             oncommand="gFindBar.onFindCommand();"
+             observes="isImage"/>
+    <command id="cmd_findAgain"
+             oncommand="gFindBar.onFindAgainCommand(false);"
+             observes="isImage"/>
+    <command id="cmd_findPrevious"
+             oncommand="gFindBar.onFindAgainCommand(true);"
+             observes="isImage"/>
 #ifdef MOZ_PLACES_BOOKMARKS
    <command id="Browser:AddLinkBookmark"
             oncommand="PlacesCommandHook.bookmarkLink(gContextMenu.linkURL, gContextMenu.linkText());"/>
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -94,6 +94,7 @@ var gCharsetMenu = null;
 var gLastBrowserCharset = null;
 var gPrevCharset = null;
 var gURLBar = null;
+var gFindBar = null;
 var gProxyButton = null;
 var gProxyFavIcon = null;
 var gProxyDeck = null;
@ -788,11 +789,10 @@ function BrowserStartup()

  var sidebarSplitter;
  if (window.opener && !window.opener.closed) {
-    if (window.opener.gFindBar && window.opener.gFindBar.mFindMode == FIND_NORMAL) {
-      var openerFindBar = window.opener.document.getElementById("FindToolbar");
-      if (openerFindBar && !openerFindBar.hidden)
-        gFindBar.openFindBar();
-    }
+    var openerFindBar = window.opener.gFindBar;
+    if (openerFindBar && !openerFindBar.hidden &&
+        openerFindBar.findMode == gFindBar.FIND_NORMAL)
+      gFindBar.open();

    var openerSidebarBox = window.opener.document.getElementById("sidebar-box");
    // The opener can be the hidden window too, if we're coming from the state
@ -882,6 +882,7 @@ function prepareForStartup()
  gURLBar = document.getElementById("urlbar");
  gNavigatorBundle = document.getElementById("bundle_browser");
  gProgressMeterPanel = document.getElementById("statusbar-progresspanel");
+  gFindBar = document.getElementById("FindToolbar");
  gBrowser.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver.onUpdatePageReport, false);
  // Note: we need to listen to untrusted events, because the pluginfinder XBL
  // binding can't fire trusted ones (runs with page privileges).
@ -987,8 +988,6 @@ function delayedStartup()
    sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
  }

-  gFindBar.initFindBar();
-
 #ifndef MOZ_PLACES_BOOKMARKS
  // add bookmark options to context menu for tabs
  addBookmarkMenuitems();
@ -1162,8 +1161,6 @@ function BrowserShutdown()
    gSanitizeListener.shutdown();

  BrowserOffline.uninit();
-  
-  gFindBar.uninitFindBar();

  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
@ -2558,9 +2555,8 @@ function toggleAffectedChrome(aHide)
    gChromeState.statusbarOpen = !statusbar.hidden;
    statusbar.hidden = aHide;

-    var findBar = document.getElementById("FindToolbar");
-    gChromeState.findOpen = !findBar.hidden;
-    gFindBar.closeFindBar();
+    gChromeState.findOpen = !gFindBar.hidden;
+    gFindBar.close();
  }
  else {
    if (gChromeState.notificationsOpen) {
@ -2573,7 +2569,7 @@ function toggleAffectedChrome(aHide)
    }

    if (gChromeState.findOpen)
-      gFindBar.openFindBar();
+      gFindBar.open();
  }

  if (gChromeState.sidebarOpen)
@ -3817,7 +3813,6 @@ nsBrowserStatusHandler.prototype =
    // Do not update urlbar if there was a subframe navigation

    var browser = getBrowser().selectedBrowser;
-    var findField = document.getElementById("find-field");
    if (aWebProgress.DOMWindow == content) {

      if (location == "about:blank" || location == "") {   //second condition is for new tabs, otherwise
@ -3836,9 +3831,6 @@ nsBrowserStatusHandler.prototype =
      if (!gBrowser.mTabbedMode && aWebProgress.isLoadingDocument)
        gBrowser.setIcon(gBrowser.mCurrentTab, null);

-      if (findField)
-        setTimeout(function() { findField.value = browser.findString; }, 0, findField, browser);
-
      //XXXBlake don't we have to reinit this.urlBar, etc.
      //         when the toolbar changes?
      if (gURLBar) {
@ -3870,14 +3862,17 @@ nsBrowserStatusHandler.prototype =
      }
    }
    UpdateBackForwardButtons();
-    if (findField && gFindBar.mFindMode != FIND_NORMAL) {
+
+    if (gFindBar.findMode != gFindBar.FIND_NORMAL) {
      // Close the Find toolbar if we're in old-style TAF mode
-      gFindBar.closeFindBar();
+      gFindBar.close();
    }

-    //fix bug 253793 - turn off highlight when page changes
-    if (document.getElementById("highlight").checked)
-      document.getElementById("highlight").removeAttribute("checked");
+    // XXXmano new-findbar, do something useful once it lands.
+    // Of course, this is especially wrong with bfcache on...
+
+    // fix bug 253793 - turn off highlight when page changes
+    gFindBar.getElement("highlight").checked = false;

    // See bug 358202, when tabs are switched during a drag operation,
    // timers don't fire on windows (bug 203573)
@ -4011,7 +4006,6 @@ nsBrowserStatusHandler.prototype =
      observerService.notifyObservers(content, notification, urlStr);
    } catch (e) {
    }
-    setTimeout(function() { if (document.getElementById("highlight").checked) toggleHighlight(true); }, 0);
  }
 }

--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@ -56,7 +56,6 @@
 #endif

 <?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>

 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>

@ -526,7 +525,7 @@
 #endif
  </stack>

-#include ../../../toolkit/components/typeaheadfind/content/findBar.inc
+  <findbar browserid="content" id="FindToolbar"/>
  
  <statusbar class="chromeclass-status" id="status-bar"
             ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
--- a/browser/base/content/global-scripts.inc
+++ b/browser/base/content/global-scripts.inc
@ -39,7 +39,6 @@

 <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
 <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
 <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
 #ifdef MOZ_PLACES
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@ -75,7 +75,7 @@

 toolbarbutton.bookmark-item:hover
 {
-  background:url("chrome://browser/skin/bookmark-hover-left.png") no-repeat left center;
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-left.png") no-repeat left center;
 }

 toolbarbutton.bookmark-item:hover:active, toolbarbutton.bookmark-item[open="true"] {
@ -90,40 +90,20 @@ toolbarbutton.bookmark-item:not([container]) > .toolbarbutton-text {
  padding-right: 7px;
 }

-#find-next > .toolbarbutton-text,
-#find-previous > .toolbarbutton-text,
-#highlight > .toolbarbutton-text {
-  -moz-margin-start: 0px;
-}

 toolbarbutton.bookmark-item:not([container]):hover > .toolbarbutton-text,
-toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker,
-#find-next:not([disabled]):hover > .toolbarbutton-text, 
-#find-previous:not([disabled]):hover > .toolbarbutton-text,
-#highlight:not([disabled]):hover > .toolbarbutton-text
+toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker 
 {
-  background: url("chrome://browser/skin/bookmark-hover-right.png") no-repeat right center;
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right center;;
  color: #fff;
 }

-#find-next:not([disabled]):hover, 
-#find-previous:not([disabled]):hover,
-#highlight:not([disabled]):hover
+toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text
 {
-  background:url("chrome://browser/skin/bookmark-hover-left.png") no-repeat left center;
-}
-
-toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text,
-#FindToolbar > toolbarbutton:not([disabled]):hover > .toolbarbutton-icon 
-{
-  background: url("chrome://browser/skin/bookmark-hover-mid.png") repeat-x;
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-mid.png") repeat-x;
  color: #fff;
 }

-#find-closebutton > .toolbarbutton-icon  {
-	background-image: none !important;
-}
-
 toolbarbutton.bookmark-item:not([container]):hover:active  > .toolbarbutton-text,
 toolbarbutton.bookmark-item[open] > .toolbarbutton-menu-dropmarker,
 toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropmarker 
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@ -1,9 +1,6 @@
 classic.jar:
 % skin browser classic/1.0 %skin/classic/browser/
  skin/classic/browser/bookmark_toolbar_background.gif
-  skin/classic/browser/bookmark-hover-left.png
-  skin/classic/browser/bookmark-hover-mid.png
-  skin/classic/browser/bookmark-hover-right.png
  skin/classic/browser/bookmark-open-left.png
  skin/classic/browser/bookmark-open-mid.png
  skin/classic/browser/bookmark-open-right.png
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@ -1185,11 +1185,6 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] {
  padding: 0px 2px 0px 2px !important;
 }

-#FindToolbar > .tabs-closebutton {
-  border: 1px solid transparent;
-  padding: 3px 2px 4px 2px !important;
-}
-
 toolbarbutton.chevron {
  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@ -1525,11 +1525,12 @@ function MsgViewPageSource()

 function MsgFind()
 {
-  gFindBar.onFindCmd();
+  document.getElementById("FindToolbar").onFindCommand();
 }
+
 function MsgFindAgain(reverse)
 {
-  gFindBar.onFindAgainCmd(reverse);
+  document.getElementById("FindToolbar").onFindAgainCommand(reverse);
 }

 function MsgFilters(emailAddress, folder)
@ -2415,8 +2416,9 @@ function OnMsgParsed(aUrl)
  // If the find bar is visible and we just loaded a new message, re-run 
  // the find command. This means the new message will get highlighted and
  // we'll scroll to the first word in the message that matches the find text.
-  if (gFindBar.isFindBarVisible())
-    gFindBar.find();
+  var findBar = document.getElementById("FindToolbar");
+  if (!findBar.hidden)
+    findBar.onFindAgainCommand(false);
    
  gMessageNotificationBar.setPhishingMsg(aUrl);
 }
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@ -38,7 +38,6 @@

 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>

 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowExtrasOverlay.xul"?>
@ -54,8 +53,6 @@
  %contentAreaCommandsDTD;
  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
  %brandDTD;
-  <!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd">
-  %findBarDTD;
 ]>

 <overlay
@ -66,15 +63,13 @@
 <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
 <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>

 <stringbundleset id="stringbundleset">
  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <stringbundle id="bundle_shell" src="chrome://messenger/locale/shellservice.properties"/>
-  <stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>  
+  <stringbundle id="bundle_shell" src="chrome://messenger/locale/shellservice.properties"/> 
  <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
 </stringbundleset>
 
@ -2210,8 +2205,6 @@
    </hbox>
  </deck>

-#include ../../../toolkit/components/typeaheadfind/content/findBar.inc
-
  <statusbar class="chromeclass-status" id="status-bar">
  <hbox insertbefore="unreadMessageCount"  id="statusTextBox" flex="1">
    <statusbarpanel id="offline-status" class="statusbarpanel-iconic" oncommand="MailOfflineMgr.toggleOfflineStatus();"/>
--- a/mail/base/content/messageWindow.js
+++ b/mail/base/content/messageWindow.js
@ -319,8 +319,6 @@ function delayedOnLoadMessageWindow()

  CreateView(originalView);
  
-  gFindBar.initFindBar();
-  
  // initialize the customizeDone method on the customizeable toolbar
  var toolbox = document.getElementById("mail-toolbox");
  toolbox.customizeDone = MailToolboxCustomizeDone;
@ -550,8 +548,6 @@ function OnUnloadMessageWindow()
 	OnUnloadMsgHeaderPane();

 	OnMailWindowUnload();
-	
-	gFindBar.uninitFindBar();
 }

 function CreateMessageWindowGlobals()
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@ -162,7 +162,7 @@
             disablesecurity="true" disablehistory="true" type="content-primary" 
             src="about:blank" onclick="return contentAreaClick(event);" autofind="false"/>
    <hbox id="attachmentView"/>
-    <toolbar id="FindToolbar"/>
+    <findbar id="FindToolbar" browserid="messagepane"/>
  </vbox>  

  <statusbar class="chromeclass-status" id="status-bar"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@ -404,7 +404,7 @@
                   disablehistory="true" type="content-primary" src="about:blank"
                   disablesecurity="true" onclick="return contentAreaClick(event);"/>
          <hbox id="attachmentView"/>
-          <toolbar id="FindToolbar"/>
+          <findbar id="FindToolbar" browserid="messagepane"/>
        </vbox>  
      </box>
    </vbox>             
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@ -911,8 +911,6 @@ function delayedOnLoadMessenger()
  //Set focus to the Thread Pane the first time the window is opened.
  SetFocusThreadPane();
  
-  gFindBar.initFindBar();  
-  
  // initialize the customizeDone method on the customizeable toolbar
  var toolbox = document.getElementById("mail-toolbox");
  toolbox.customizeDone = MailToolboxCustomizeDone;
@ -928,8 +926,6 @@ function OnUnloadMessenger()
  pref.QueryInterface(Components.interfaces.nsIPrefBranch2);
  pref.removeObserver("mail.pane_config.dynamic", MailPrefObserver);
  pref.removeObserver("mail.showFolderPaneColumns", MailPrefObserver);
-  
-  gFindBar.uninitFindBar();

  // FIX ME - later we will be able to use onload from the overlay
  OnUnloadMsgHeaderPane();
--- a/toolkit/components/help/content/help.js
+++ b/toolkit/components/help/content/help.js
@ -140,8 +140,6 @@ function init() {
  strBundle = document.getElementById("bundle_help");
  emptySearchText = strBundle.getString("emptySearchText");

-  gFindBar.initFindBar();
-
  // Get the content pack, base URL, and help topic
  var helpTopic = defaultTopic;
  if ("arguments" in window && 
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@ -39,7 +39,6 @@
 # ***** END LICENSE BLOCK *****

 <?xml-stylesheet href="chrome://help/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>

 <?xul-overlay href="chrome://help/content/helpContextOverlay.xul"?>
 <!DOCTYPE window [
@ -47,8 +46,6 @@
    %brandDTD;
    <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
    %helpDTD;
-    <!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
-    %findBarDTD;
    <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
    %globalDTD;
 ]>
@ -70,16 +67,13 @@
        persist="width height screenX screenY"
 #endif
        onload="init();"
-        onunload="gFindBar.uninitFindBar(); window.XULBrowserWindow.destroy();">
+        onunload="window.XULBrowserWindow.destroy();">

  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
  <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>

-  <stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
-    
  <menupopup id="backMenu" position="after_start"
             onpopupshowing="return createBackMenu(event);"
             oncommand="gotoHistoryIndex(event);"/>
@ -102,9 +96,12 @@
    <command id="cmd_closeWindow" oncommand="close();"/>
    <command id="cmd_textZoomReduce" oncommand="ZoomManager.prototype.getInstance().reduce();"/>
    <command id="cmd_textZoomEnlarge" oncommand="ZoomManager.prototype.getInstance().enlarge();"/>
-    <command id="cmd_find" oncommand="gFindBar.onFindCmd();"/>
-    <command id="cmd_findAgain" oncommand="gFindBar.onFindAgainCmd(false);"/>
-    <command id="cmd_findPrevious" oncommand="gFindBar.onFindAgainCmd(true);"/>
+    <command id="cmd_find"
+             oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
+    <command id="cmd_findAgain"
+             oncommand="document.getElementById('FindToolbar').onFindAgainCommand(false);"/>
+    <command id="cmd_findPrevious"
+             oncommand="document.getElementById('FindToolbar').onFindAgainCommand(true);"/>
    <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')" disabled="true"/>
    <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')"/>
  </commandset>
@ -310,7 +307,7 @@
        <browser context="contentAreaContextMenu"
                 type="content-primary" id="help-content"
                 src="about:blank" flex="1"/>
-#include ../../typeaheadfind/content/findBar.inc
+        <findbar id="FindToolbar" browserid="help-content"/>
      </vbox>
    </hbox>
  </vbox>
--- a/toolkit/components/typeaheadfind/content/findBar.inc
+++ b/toolkit/components/typeaheadfind/content/findBar.inc
@ -1,31 +0,0 @@
-    <toolbar id="FindToolbar" hidden="true" align="center" fullscreentoolbar="true">
-      <toolbarbutton id="find-closebutton" tooltiptext="&findCloseButton.tooltip;"
-                     oncommand="gFindBar.closeFindBar();"/>
-
-      <label control="find-field" id="find-label" class="find-fast"/>
-      <hbox id="find-field-container" class="find-fast">
-        <textbox id="find-field" oninput="gFindBar.find(this.value);"
-                onkeypress="gFindBar.onFindBarKeyPress(event);"
-                onfocus="gFindBar.onFindBarFocus();"
-                onblur="gFindBar.onFindBarBlur();"
-                oncompositionstart="gFindBar.onFindBarCompositionStart(event);"
-                oncompositionend="gFindBar.onFindBarCompositionEnd(event);"/>
-      </hbox>
-      <toolbarbutton id="find-next" label="&next.label;" tooltiptext="&next.tooltip;"
-                     command="cmd_findAgain" disabled="true" accesskey="&next.accesskey;"/>
-      <toolbarbutton id="find-previous" label="&previous.label;" tooltiptext="&previous.tooltip;"
-                     command="cmd_findPrevious" disabled="true" accesskey="&previous.accesskey;"/>
-      <toolbarbutton id="highlight" label="&highlight.label;"
-                     tooltiptext="&highlight.tooltiptext;"
-                     oncommand="gFindBar.toggleHighlight(!this.checked);
-                                if (gFindBar.mFindMode != FIND_NORMAL)
-                                  gFindBar.setFindCloseTimeout();"
-                     type="checkbox" disabled="true"
-                     accesskey="&highlight.accesskey;"/>
-      <checkbox id="find-case-sensitive"
-                oncommand="gFindBar.toggleCaseSensitiveCheckbox(this.checked);"
-                label="&caseSensitiveCheckbox.label;" accesskey="&caseSensitiveCheckbox.accesskey;"/>
-      <label id="match-case-status" class="find-fast"/>
-      <image id="find-status-icon"/>
-      <label id="find-status"/>
-    </toolbar>
--- a/toolkit/components/typeaheadfind/content/findBar.js
+++ b/toolkit/components/typeaheadfind/content/findBar.js
--- a/toolkit/components/typeaheadfind/jar.mn
+++ b/toolkit/components/typeaheadfind/jar.mn
@ -1,3 +1,2 @@
 toolkit.jar:
    content/global/notfound.wav                   (content/notfound.wav)
-*   content/global/findBar.js                     (content/findBar.js)
--- a/toolkit/components/viewsource/content/viewPartialSource.js
+++ b/toolkit/components/viewsource/content/viewPartialSource.js
@ -75,8 +75,6 @@ function onLoadViewPartialSource()
  } else {
    document.getElementById("menu_highlightSyntax").setAttribute("hidden", "true");
  }
-  
-  gFindBar.initFindBar();

  if (window.arguments[3] == 'selection')
    viewPartialSourceForSelection(window.arguments[2]);
@ -86,11 +84,6 @@ function onLoadViewPartialSource()
  window._content.focus();
 }

-function onUnloadViewPartialSource()
-{
-  gFindBar.uninitFindBar();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // view-source of a selection with the special effect of remapping the selection
 // to the underlying view-source output
--- a/toolkit/components/viewsource/content/viewPartialSource.xul
+++ b/toolkit/components/viewsource/content/viewPartialSource.xul
@ -44,7 +44,6 @@

 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>

 <!DOCTYPE window [
@ -52,14 +51,11 @@
 %brandDTD;
 <!ENTITY % sourceDTD SYSTEM "chrome://global/locale/viewSource.dtd" >
 %sourceDTD;
-<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
-%findBarDTD;
 ]>

 <window id="viewSource"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="onLoadViewPartialSource();"
-        onunload="onUnloadViewPartialSource();"
        contenttitlesetting="true"
        title="&mainWindow.title;" 
        titlemodifier="&mainWindow.titlemodifier;" 
@ -72,7 +68,6 @@

  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
  <script type="application/x-javascript" src="chrome://global/content/viewSource.js"/>
  <script type="application/x-javascript" src="chrome://global/content/viewPartialSource.js"/>
@ -80,7 +75,6 @@
  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>

  <stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>
-  <stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>

  <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
  <command id="cmd_print" oncommand="PrintUtils.print();"/>
@ -88,9 +82,12 @@
  <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
  <command id="cmd_close" oncommand="window.close();"/>
  <commandset id="editMenuCommands"/>
-  <command id="cmd_find" oncommand="gFindBar.onFindCmd();"/>
-  <command id="cmd_findAgain" oncommand="gFindBar.onFindAgainCmd(false);"/>
-  <command id="cmd_findPrevious" oncommand="gFindBar.onFindAgainCmd(true);"/>
+  <command id="cmd_find"
+           oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
+  <command id="cmd_findAgain"
+           oncommand="document.getElementById('FindToolbar').onFindAgainCommand(false);"/>
+  <command id="cmd_findPrevious"
+           oncommand="document.getElementById('FindToolbar').onFindAgainCommand(true);"/>
  <command id="cmd_goToLine" oncommand="ViewSourceGoToLine();" disabled="true"/>
  <command id="cmd_highlightSyntax" oncommand="highlightSyntax();"/>
  <command id="cmd_wrapLongLines" oncommand="wrapLongLines()"/>
@ -189,9 +186,7 @@

    <browser id="content" type="content-primary" name="content" src="about:blank" flex="1"
             disablehistory="true" context="viewSourceContextMenu"/>
-
-#include ../../typeaheadfind/content/findBar.inc
-
+    <findbar id="FindToolbar" browserid="content"/>
  </vbox>

 </window>
--- a/toolkit/components/viewsource/content/viewSource.js
+++ b/toolkit/components/viewsource/content/viewSource.js
@ -68,12 +68,6 @@ function onLoadViewSource()
 {
  viewSource(window.arguments[0]);
  document.commandDispatcher.focusedWindow = content;
-  gFindBar.initFindBar();
-}
-
-function onUnloadViewSource()
-{
-  gFindBar.uninitFindBar();
 }

 function getBrowser()
--- a/toolkit/components/viewsource/content/viewSource.xul
+++ b/toolkit/components/viewsource/content/viewSource.xul
@ -44,7 +44,6 @@

 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/content/viewSource.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>

@ -53,14 +52,11 @@
 %brandDTD;
 <!ENTITY % sourceDTD SYSTEM "chrome://global/locale/viewSource.dtd" >
 %sourceDTD;
-<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
-%findBarDTD;
 ]>

 <window id="viewSource"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        onload="onLoadViewSource();"
-        onunload="onUnloadViewSource();"
        contenttitlesetting="true"
        title="&mainWindow.title;" 
        titlemodifier="&mainWindow.titlemodifier;" 
@ -77,8 +73,7 @@
  <script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
  <script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
-  <stringbundle id="bundle_findBar" src="chrome://global/locale/findbar.properties"/>
+  
  <stringbundle id="viewSourceBundle" src="chrome://global/locale/viewSource.properties"/>

  <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
@ -87,9 +82,12 @@
  <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
  <command id="cmd_close" oncommand="window.close();"/>
  <commandset id="editMenuCommands"/>
-  <command id="cmd_find" oncommand="gFindBar.onFindCmd();"/>
-  <command id="cmd_findAgain" oncommand="gFindBar.onFindAgainCmd(false);"/>
-  <command id="cmd_findPrevious" oncommand="gFindBar.onFindAgainCmd(true);"/>
+  <command id="cmd_find"
+           oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
+  <command id="cmd_findAgain"
+           oncommand="document.getElementById('FindToolbar').onFindAgainCommand(false);"/>
+  <command id="cmd_findPrevious"
+           oncommand="document.getElementById('FindToolbar').onFindAgainCommand(true);"/>
  <command id="cmd_reload" oncommand="ViewSourceReload();"/>
  <command id="cmd_goToLine" oncommand="ViewSourceGoToLine();" disabled="true"/>
  <command id="cmd_highlightSyntax" oncommand="highlightSyntax();"/>
@ -206,7 +204,7 @@

    <browser id="content" type="content-primary" name="content" src="about:blank" flex="1"
             disablehistory="true" context="viewSourceContextMenu"/>
-#include ../../typeaheadfind/content/findBar.inc
+    <findbar id="FindToolbar" browserid="content"/>
  </vbox> 

  <statusbar id="status-bar" class="chromeclass-status">
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@ -71,6 +71,7 @@ toolkit.jar:
 *+ content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
 *+ content/global/bindings/tree.xml            (widgets/tree.xml)
 *+ content/global/bindings/wizard.xml          (widgets/wizard.xml)
+*+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
   content/global/bindings/autoscroll_all.png  (widgets/autoscroll_all.png)
   content/global/bindings/autoscroll_h.png    (widgets/autoscroll_h.png)
   content/global/bindings/autoscroll_v.png    (widgets/autoscroll_v.png)
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@ -1100,3 +1100,9 @@ richlistbox {
 richlistitem {
  -moz-binding: url('chrome://global/content/bindings/richlistbox.xml#richlistitem');
 }
+
+
+/*********** findbar ************/
+findbar {
+  -moz-binding: url('chrome://global/content/bindings/findbar.xml#findbar');
+}
--- a/toolkit/themes/pinstripe/global/findBar.css
+++ b/toolkit/themes/pinstripe/global/findBar.css
@ -2,71 +2,69 @@

 /* ::::: find toolbar ::::: */

-#find-closebutton {
+findbar {
+  background-image: url("chrome://global/skin/icons/white-gray-gradient.gif");
+  background-repeat: repeat-x;
+  background-position: bottom right;
+  background-color: rgb(246, 246, 246);
+  border-top: 1px solid #b3b3b3;
+  border-bottom: none;
+  list-style-image: url("chrome://global/skin/icons/find.png");
+}
+
+findbar > toolbarbutton.findbar-closebutton {
  padding-right: 4px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
-  list-style-image: none;
+  list-style-image: url("chrome://global/skin/icons/closetab.png");
  border: none;
+  background-image: none;
 }

-#find-closebutton {
-  background-image: none !important;
-}
-
-#find-closebutton:hover {
+findbar > toolbarbutton.findbar-closebutton:hover {
  list-style-image: url("chrome://global/skin/icons/closetab-hover.png") !important;
 }

-#find-closebutton:hover:active {
-	list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+findbar > toolbarbutton.findbar-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
 }

-#FindToolbar {
-	background-image: url("chrome://global/skin/icons/white-gray-gradient.gif");
-	background-repeat: repeat-x;
-	background-position: bottom right;
-	background-color: rgb(246, 246, 246);
-        border-top: 1px solid #b3b3b3;
-	border-bottom: none;
-	list-style-image: url("chrome://global/skin/icons/find.png");
-}
-
-#FindToolbar > toolbarbutton {
+findbar > toolbarbutton {
  padding-left: 7px;
 }

-#FindToolbar > label {
+findbar > label {
  font-weight: bold;
  color: #565656;
 }

-#FindToolbar > toolbarbutton > .toolbarbutton-icon 
-{
+findbar > toolbarbutton > .toolbarbutton-icon {
  height: 16px !important;
  padding: 0;
 }

-#FindToolbar > toolbarbutton > .toolbarbutton-text, #FindToolbar > checkbox > .checkbox-label-box {
+findbar > toolbarbutton > .toolbarbutton-text,
+findbar > checkbox > .checkbox-label-box {
  height: 16px !important;
  padding: 1px 7px 1px 2px;
  font-weight: bold;
  color: #565656;
 }

-#FindToolbar .checkbox-icon, #find-closebutton > .toolbarbutton-text  {
+findbar .checkbox-icon,
+findbar > toolbarbutton.findbar-closebutton > .toolbarbutton-text {
  display: none;  
 }

-#FindToolbar .checkbox-check {
+findbar .checkbox-check {
  -moz-appearance: checkbox-small;
  margin-left: 7px;
 }

-#FindToolbar .checkbox-label {
+findbar .checkbox-label {
  padding-bottom: 0;
 }

-#find-field {
+findbar > .find-field-container > textbox.findbar-textbox {
+  -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar-textbox");
  background: url("chrome://global/skin/icons/find-bar-background.png") no-repeat;
  -moz-appearance: none;
  height: 22px !important;
@ -76,130 +74,96 @@
  padding: 3px 14px 3px 24px;
 }

-#FindToolbar[flash="true"] > #find-field-container > #find-field {
+findbar[flash="true"] > .find-field-container > textbox.findbar-textbox {
  background: url("chrome://global/skin/icons/find-bar-flash.png") no-repeat;
 }

-#find-field[status="notfound"] {
+findbar > .find-field-container > textbox.findbar-textbox[status="notfound"] {
  background: url("chrome://global/skin/icons/find-bar-notfound.png") no-repeat;
  color: #FFF;
 }

-/* ::::: find ::::: */
-
-#find-previous 
-{
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#find-previous[disabled="true"]
-{
-  opacity: 0.5;
-}
-	
-#find-previous:hover
-{
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-#find-next 
-{
-  list-style-image: url("chrome://global/skin/icons/find.png");
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-#find-next[disabled="true"]
-{
-  opacity: 0.5;
-}
-
-#find-next:hover
-{
-  -moz-image-region: rect(16px 32px 32px 16px);
-}
-
-#highlight {
-  -moz-image-region: rect(0px 48px 16px 32px);
-}
-
-#highlight:hover {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-#highlight[disabled="true"] {
-  opacity: 0.5;
-}
-
-#highlight:active, #highlight[checked="true"] {
-  -moz-image-region: rect(48px 48px 64px 32px);
-}
-
-#highlight[checked="true"]:hover {
-  -moz-image-region: rect(64px 48px 80px 32px);
-}
-
-#find-status-icon
-{
-  margin-left: 12px;
-  width: 16px;
-  height: 16px;
-}
 /* find-next button */

-#find-next {
+findbar > toolbarbutton.findbar-find-next {
  -moz-image-region: rect(0px 16px 16px 0px);
 }

-#find-next:hover {
+findbar > toolbarbutton.findbar-find-next:hover {
  -moz-image-region: rect(16px 16px 32px 0px);
 }

-#find-next[disabled="true"] {
+findbar > toolbarbutton.findbar-find-next[disabled="true"] {
  -moz-image-region: rect(32px 16px 48px 0px) !important;
 }

 /* find-previous button */

-#find-previous {
+findbar > toolbarbutton.findbar-find-previous {
  -moz-image-region: rect(0px 32px 16px 16px);
 }

-#find-previous:hover {
+findbar > toolbarbutton.findbar-find-previous:hover {
  -moz-image-region: rect(16px 32px 32px 16px);
 }

-#find-previous[disabled="true"] {
+findbar > toolbarbutton.findbar-find-previous[disabled="true"] {
  -moz-image-region: rect(32px 32px 48px 16px) !important;
 }

 /* highlight button */

-#highlight {
+findbar > toolbarbutton.findbar-highlight {
  -moz-image-region: rect(0px 48px 16px 32px);
 }

-#highlight:hover {
+findbar > toolbarbutton.findbar-highlight:hover {
  -moz-image-region: rect(16px 48px 32px 32px);
 }

-#highlight[disabled="true"] {
+findbar > toolbarbutton.findbar-highlight[disabled="true"] {
  -moz-image-region: rect(32px 48px 48px 32px) !important;
 }

-#highlight:active, #highlight[checked="true"] {
+findbar > toolbarbutton.findbar-highlight:active, findbar > .findbar-highlight[checked="true"] {
  -moz-image-region: rect(48px 48px 64px 32px);
 }

-#highlight[checked="true"]:hover {
+findbar > toolbarbutton.findbar-highlight[checked="true"]:hover {
  -moz-image-region: rect(64px 48px 80px 32px);
 }

-#find-status-icon {
+findbar > image.find-status-icon {
  display: none;
 }

-#find-status {
-	color: #436599 !important;
+findbar > label.findbar-find-status {
+  color: #436599 !important;
 }

+findbar > toolbarbutton.findbar-find-next > .toolbarbutton-text,
+findbar > toolbarbutton.findbar-find-previous > .toolbarbutton-text,
+findbar > toolbarbutton.findbar-highlight > .toolbarbutton-text {
+  margin-left: 0 !important;
+}
+
+findbar > toolbarbutton.findbar-find-next:not([disabled]):hover > .toolbarbutton-text, 
+findbar > toolbarbutton.findbar-find-previous:not([disabled]):hover > .toolbarbutton-text,
+findbar > toolbarbutton.findbar-highlight:not([disabled]):hover > .toolbarbutton-text {
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right center;
+  color: #fff;
+}
+
+findbar > toolbarbutton.findbar-find-next:not([disabled]):hover,
+findbar > toolbarbutton.findbar-find-previous:not([disabled]):hover,
+findbar > toolbarbutton.findbar-highlight:not([disabled]):hover
+{
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-left.png") no-repeat left center;
+}
+
+findbar > toolbarbutton.findbar-find-next:not([disabled]):hover > .toolbarbutton-icon,
+findbar > toolbarbutton.findbar-find-previous:not([disabled]):hover > .toolbarbutton-icon,
+findbar > toolbarbutton.findbar-highlight:not([disabled]):hover > .toolbarbutton-icon  {
+  background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-mid.png") repeat-x;
+  color: #fff;
+}
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@ -165,6 +165,9 @@ classic.jar:
 +  skin/classic/global/toolbar/spring.gif                             (toolbar/spring.gif)
 +  skin/classic/global/toolbar/toolbar-pinstripe-overlay.png          (toolbar/toolbar-pinstripe-overlay.png)
 +  skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
+  skin/classic/global/toolbar/toolbarbutton-customhover-left.png     (toolbar/toolbarbutton-customhover-left.png)
+  skin/classic/global/toolbar/toolbarbutton-customhover-mid.png      (toolbar/toolbarbutton-customhover-mid.png)
+  skin/classic/global/toolbar/toolbarbutton-customhover-right.png    (toolbar/toolbarbutton-customhover-right.png)
 +  skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
 +  skin/classic/global/tree/folder-dis.png                            (tree/folder-dis.png)
 +  skin/classic/global/tree/folder.png                                (tree/folder.png)
--- a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-left.png
+++ b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-left.png
--- a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-mid.png
+++ b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-mid.png
--- a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png
+++ b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png
--- a/toolkit/themes/winstripe/global/findBar.css
+++ b/toolkit/themes/winstripe/global/findBar.css
@ -1,6 +1,6 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

-#find-closebutton {
+findbar > toolbarbutton.findbar-closebutton {
  border: 1px solid transparent;
  padding: 3px 2px 4px 2px !important;
  list-style-image: url("chrome://global/skin/icons/close.png");
@ -8,21 +8,21 @@
  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }

-#find-closebutton > .toolbarbutton-icon {
+findbar > toolbarbutton.findbar-closebutton > .toolbarbutton-icon {
  -moz-margin-end: 0px !important;
  -moz-padding-end: 2px !important;
  -moz-padding-start: 2px !important;
 }

-#find-closebutton:hover {
+findbar > toolbarbutton.findbar-closebutton:hover {
  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }

-#find-closebutton:hover:active {
+findbar > toolbarbutton.findbar-closebutton:hover:active {
  -moz-image-region: rect(0px, 48px, 16px, 32px);
 }

-#FindToolbar {
+findbar {
  -moz-appearance: none !important;
  border-top: 2px solid;
  -moz-border-top-colors: ThreeDShadow ThreeDHighlight !important;
@ -32,59 +32,58 @@

 /* find-next button */

-#find-next {
+findbar > toolbarbutton.findbar-find-next {
  list-style-image: url("chrome://global/skin/icons/find.png");
  -moz-image-region: rect(0px 16px 16px 0px);
 }

-#find-next:hover {
+findbar > toolbarbutton.findbar-find-next:hover {
  -moz-image-region: rect(16px 16px 32px 0px);
 }

-#find-next[disabled="true"] {
+findbar > toolbarbutton.findbar-find-next[disabled="true"] {
  -moz-image-region: rect(32px 16px 48px 0px) !important;
 }

 /* find-previous button */

-#find-previous {
+findbar > toolbarbutton.findbar-find-previous {
  list-style-image: url("chrome://global/skin/icons/find.png");
  -moz-image-region: rect(0px 32px 16px 16px);
 }

-#find-previous:hover {
+findbar > toolbarbutton.findbar-find-previous:hover {
  -moz-image-region: rect(16px 32px 32px 16px);
 }

-#find-previous[disabled="true"] {
+findbar > toolbarbutton.findbar-find-previous[disabled="true"] {
  -moz-image-region: rect(32px 32px 48px 16px) !important;
 }

 /* highlight button */

-#highlight {
+findbar > toolbarbutton.findbar-highlight {
  list-style-image: url("chrome://global/skin/icons/find.png");
  -moz-image-region: rect(0px 48px 16px 32px);
 }

-#highlight:hover {
+findbar > toolbarbutton.findbar-highlight:hover {
  -moz-image-region: rect(16px 48px 32px 32px);
 }

-#highlight[disabled="true"] {
+findbar > toolbarbutton.findbar-highlight[disabled="true"] {
  -moz-image-region: rect(32px 48px 48px 32px) !important;
 }

-#highlight:active, #highlight[checked="true"] {
+findbar > toolbarbutton.findbar-highlight:active, findbar > .findbar-highlight[checked="true"] {
  -moz-image-region: rect(48px 48px 64px 32px);
 }

-#highlight[checked="true"]:hover {
+findbar > toolbarbutton.findbar-highlight[checked="true"]:hover {
  -moz-image-region: rect(64px 48px 80px 32px);
 }

-#find-status-icon
-{
+findbar > image.find-status-icon {
  list-style-image: none;
  margin-top: 2px;
  margin-bottom: 0px;
@ -94,8 +93,7 @@
  height: 16px;
 }

-#find-status
-{
+findbar > label.findbar-find-status {
  margin-top: 0px;
  margin-bottom: 0px;
  -moz-margin-start: 3px;
@ -103,35 +101,30 @@
  padding: 2px;
 }

-#find-status-icon[status="notfound"]
-{
+findbar > image.find-status-icon[status="notfound"] {
  list-style-image: url("chrome://global/skin/icons/notfound.png");
 }

-#find-field
-{
+findbar > .find-field-container > textbox.findbar-textbox {
+  -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar-textbox");
  -moz-appearance: none;
  border: none;
  margin: 0px;
 }

-#find-field[status="notfound"]
-{
+findbar > .find-field-container > textbox.findbar-textbox[status="notfound"] {
  background-color: #FF6666;
  color: #FFFFFF;
 }

-#FindToolbar[flash="true"]  > #find-field-container > #find-field
-{
+findbar[flash="true"]  > .find-field-container > textbox.findbar-textbox {
  background-color: yellow;
 }

-#find-status-icon[status="wrapped"]
-{
+findbar > image.find-status-icon[status="wrapped"] {
  list-style-image: url("chrome://global/skin/icons/wrap.png");
 }

-#find-field-container
-{
+findbar > .find-field-container {
  -moz-appearance: textfield;
 }