From 091413037dec83174bfc731787e60735aca979da Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com" <mozilla.mano%sent.com>
Date: Sun, 26 Nov 2006 22:47:46 +0000
Subject: [PATCH] Bug 288254 - Findbar XBL widget. r=gavin,masayuki,bienvenu.

---
 browser/base/content/browser-doctype.inc      |    2 -
 browser/base/content/browser-sets.inc         |   13 +-
 browser/base/content/browser.js               |   40 +-
 browser/base/content/browser.xul              |    3 +-
 browser/base/content/global-scripts.inc       |    1 -
 .../pinstripe/browser/bookmark-hover-left.png |    0
 .../pinstripe/browser/bookmark-hover-mid.png  |    0
 .../browser/bookmark-hover-right.png          |    0
 browser/themes/pinstripe/browser/browser.css  |   30 +-
 browser/themes/pinstripe/browser/jar.mn       |    3 -
 browser/themes/winstripe/browser/browser.css  |    5 -
 mail/base/content/mailWindowOverlay.js        |   10 +-
 mail/base/content/mailWindowOverlay.xul       |    9 +-
 mail/base/content/messageWindow.js            |    4 -
 mail/base/content/messageWindow.xul           |    2 +-
 mail/base/content/messenger.xul               |    2 +-
 mail/base/content/msgMail3PaneWindow.js       |    4 -
 toolkit/components/help/content/help.js       |    2 -
 toolkit/components/help/content/help.xul      |   19 +-
 .../typeaheadfind/content/findBar.inc         |    0
 .../typeaheadfind/content/findBar.js          |    0
 toolkit/components/typeaheadfind/jar.mn       |    1 -
 .../viewsource/content/viewPartialSource.js   |    7 -
 .../viewsource/content/viewPartialSource.xul  |   19 +-
 .../viewsource/content/viewSource.js          |    6 -
 .../viewsource/content/viewSource.xul         |   18 +-
 toolkit/content/jar.mn                        |    1 +
 toolkit/content/widgets/findbar.xml           | 1225 +++++++++++++++++
 toolkit/content/xul.css                       |    6 +
 toolkit/themes/pinstripe/global/findBar.css   |  174 +--
 toolkit/themes/pinstripe/global/jar.mn        |    3 +
 .../toolbarbutton-customhover-left.png        |  Bin 0 -> 3072 bytes
 .../toolbar/toolbarbutton-customhover-mid.png |  Bin 0 -> 2841 bytes
 .../toolbarbutton-customhover-right.png       |  Bin 0 -> 4536 bytes
 toolkit/themes/winstripe/global/findBar.css   |   57 +-
 35 files changed, 1393 insertions(+), 273 deletions(-)
 delete mode 100644 browser/themes/pinstripe/browser/bookmark-hover-left.png
 delete mode 100644 browser/themes/pinstripe/browser/bookmark-hover-mid.png
 delete mode 100644 browser/themes/pinstripe/browser/bookmark-hover-right.png
 delete mode 100755 toolkit/components/typeaheadfind/content/findBar.inc
 delete mode 100755 toolkit/components/typeaheadfind/content/findBar.js
 create mode 100644 toolkit/content/widgets/findbar.xml
 create mode 100644 toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-left.png
 create mode 100644 toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-mid.png
 create mode 100644 toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png

diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc
index 80b44bf52f6..d7867b7cb5c 100644
--- 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
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 7b7fb999d31..64e6464affa 100644
--- 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());"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 1edf0d74a5d..533899c8aed 100644
--- 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);
   }
 }
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2f971fd220c..801258e277b 100644
--- 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);">
diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
index f5ef3f9590b..bd1e2523265 100644
--- 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
diff --git a/browser/themes/pinstripe/browser/bookmark-hover-left.png b/browser/themes/pinstripe/browser/bookmark-hover-left.png
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/themes/pinstripe/browser/bookmark-hover-mid.png b/browser/themes/pinstripe/browser/bookmark-hover-mid.png
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/themes/pinstripe/browser/bookmark-hover-right.png b/browser/themes/pinstripe/browser/bookmark-hover-right.png
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 1c1864bf151..36a81332c88 100755
--- 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 
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index 3ac6e2f805f..9c3ab535bfb 100644
--- 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
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index ae33c4b8fa2..0386cabda60 100644
--- 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;
 }
diff --git a/mail/base/content/mailWindowOverlay.js b/mail/base/content/mailWindowOverlay.js
index 2adae3a59f2..c8f46bc99f2 100644
--- 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);
 }
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index ca20b3f2ba2..2e523e5850f 100644
--- 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();"/>
diff --git a/mail/base/content/messageWindow.js b/mail/base/content/messageWindow.js
index 5a1026c461b..f8e7745ee45 100644
--- 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()
diff --git a/mail/base/content/messageWindow.xul b/mail/base/content/messageWindow.xul
index c12979aa9cb..40804ed95d5 100644
--- 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"/>
diff --git a/mail/base/content/messenger.xul b/mail/base/content/messenger.xul
index 250947f980c..5e86bc87d5a 100644
--- 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>             
diff --git a/mail/base/content/msgMail3PaneWindow.js b/mail/base/content/msgMail3PaneWindow.js
index b1c8be2fca6..2db25a4f4eb 100644
--- 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();
diff --git a/toolkit/components/help/content/help.js b/toolkit/components/help/content/help.js
index 6afc69987ad..c7fa4505162 100644
--- 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 && 
diff --git a/toolkit/components/help/content/help.xul b/toolkit/components/help/content/help.xul
index 24ce1a05cab..5cc9e888692 100644
--- 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>
diff --git a/toolkit/components/typeaheadfind/content/findBar.inc b/toolkit/components/typeaheadfind/content/findBar.inc
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/toolkit/components/typeaheadfind/content/findBar.js b/toolkit/components/typeaheadfind/content/findBar.js
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/toolkit/components/typeaheadfind/jar.mn b/toolkit/components/typeaheadfind/jar.mn
index 3808b727af8..4d084177b60 100755
--- 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)
diff --git a/toolkit/components/viewsource/content/viewPartialSource.js b/toolkit/components/viewsource/content/viewPartialSource.js
index f9d332111ab..5e4a2be94a2 100644
--- 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
diff --git a/toolkit/components/viewsource/content/viewPartialSource.xul b/toolkit/components/viewsource/content/viewPartialSource.xul
index 2753ebcf0f2..3211d2ccea4 100644
--- 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>
diff --git a/toolkit/components/viewsource/content/viewSource.js b/toolkit/components/viewsource/content/viewSource.js
index 2b44772f167..89595ad5554 100644
--- 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()
diff --git a/toolkit/components/viewsource/content/viewSource.xul b/toolkit/components/viewsource/content/viewSource.xul
index 3dc6f7b0bf1..0c4815ce220 100644
--- 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">
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 3f60b6bf6b4..24217903fa0 100644
--- 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)
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
new file mode 100644
index 00000000000..a72158a34e4
--- /dev/null
+++ b/toolkit/content/widgets/findbar.xml
@@ -0,0 +1,1225 @@
+<?xml version="1.0"?>
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is mozilla.org viewsource frontend.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -     Blake Ross <blake@cs.stanford.edu> (Original Author)
+   -     Masayuki Nakano <masayuki@d-toybox.com>
+   -     Ben Basson <contact@cusser.net>
+   -     Jason Barnabe <jason_barnabe@fastmail.fm>
+   -     Asaf Romano <mano@mozilla.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE bindings [
+<!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
+%findBarDTD;
+]>
+
+<bindings id="findbarBindings"
+   xmlns="http://www.mozilla.org/xbl"
+   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+   xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <!-- Private binding -->
+  <binding id="findbar-textbox"
+           extends="chrome://global/content/bindings/textbox.xml#textbox">
+    <implementation>
+
+      <field name="_findbar">null</field>
+      <property name="findbar" readonly="true">
+        <getter>
+          return this._findbar ?
+                 this._findbar : this._findbar = document.getBindingParent(this);
+        </getter>
+      </property>
+
+      <method name="getSupportedFlavours">
+        <body><![CDATA[
+          var flavourSet = new FlavourSet();
+          flavourSet.appendFlavour("text/unicode");
+          return flavourSet;
+        ]]></body>
+      </method>
+
+      <method name="onDrop">
+        <parameter name="aEvent"/>
+        <parameter name="aXferData"/>
+        <parameter name="aDragSession"/>
+        <body><![CDATA[
+          this.value = aXferData.data;
+          this.findbar._find(aXferData.data);
+        ]]></body>
+      </method>
+
+      <method name="_handleEnter">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (this.findbar._findMode == this.findbar.FIND_NORMAL) {
+            var findString = this.findbar._findField;
+            if (!findString.value)
+              return;
+#ifdef XP_MACOSX
+            if (aEvent.metaKey) {
+#else
+            if (aEvent.ctrlKey) {
+#endif
+              this.findbar.getElement("highlight").click();
+              return;
+            }
+
+            this.findbar._findAgain(aEvent.shiftKey);
+          }
+          else {
+            // We need to keep a reference to _foundLink because
+            // _finishFAYT resets it to null.
+            var tmpLink = this._findbar._foundLink;
+            if (tmpLink && this.findbar._finishFAYT(aEvent))
+              this.findbar._dispatchKeypressEvent(tmpLink, aEvent);
+          }
+        ]]></body>
+      </method>
+
+      <method name="_handleTab">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          var shouldHandle = !aEvent.altKey && !aEvent.ctrlKey &&
+                             !aEvent.metaKey;
+          if (shouldHandle &&
+              this.findbar._findMode != this.findbar.FIND_NORMAL &&
+              this.findbar._finishFAYT(aEvent)) {
+            if (aEvent.shiftKey)
+              document.commandDispatcher.rewindFocus();
+            else
+              document.commandDispatcher.advanceFocus();
+          }
+        ]]></body>
+      </method>
+    </implementation>
+
+    <handlers>
+      <handler event="input"><![CDATA[
+        this.findbar._find(this.value);
+      ]]></handler>
+
+      <handler event="keypress"><![CDATA[
+        var win = this.findbar._currentWindow ?
+          this.findbar._currentWindow : this.findbar._browser.contentWindow;
+
+        switch (event.keyCode) {
+          case KeyEvent.DOM_VK_RETURN:
+            this._handleEnter(event);
+            break;
+          case KeyEvent.DOM_VK_TAB:
+            this._handleTab(event);
+            break;
+          case KeyEvent.DOM_VK_PAGE_UP:
+            win.scrollByPages(-1);
+            event.preventDefault();
+            break;
+          case KeyEvent.DOM_VK_PAGE_DOWN:
+            win.scrollByPages(1);
+            event.preventDefault();
+            break;
+          case KeyEvent.DOM_VK_UP:
+            win.scrollByLines(-1);
+            event.preventDefault();
+            break;
+          case KeyEvent.DOM_VK_DOWN:
+            win.scrollByLines(1);
+            event.preventDefault();
+            break;
+        }
+      ]]></handler>
+
+      <handler event="blur"><![CDATA[
+        var findbar = this.findbar;
+        var fastFind = findbar._browser.fastFind;
+        if (findbar._foundEditable)
+          fastFind.collapseSelection();
+        else {
+          fastFind.setSelectionModeAndRepaint
+            (findbar.nsISelectionController.SELECTION_ON);
+        }
+        findbar._setFoundLink(null);
+        findbar._foundEditable = null;
+        findbar._currentWindow = null;
+      ]]></handler>
+
+      <handler event="compositionstart"><![CDATA[
+        // Don't close the find toolbar while IME is composing.
+        var findbar = this.findbar;
+        findbar._isIMEComposing = true;
+        if (findbar._quickFindTimeout) {
+          clearTimeout(findbar._quickFindTimeout);
+          findbar._quickFindTimeout = null;
+        }
+      ]]></handler>
+
+      <handler event="compositionend"><![CDATA[
+        var findbar = this.findbar;
+        findbar._isIMEComposing = false;
+        if (findbar._findMode != findbar.FIND_NORMAL &&
+            !findbar.hidden)
+          findbar._setFindCloseTimeout();
+      ]]></handler>
+
+      <handler event="dragdrop" phase="capturing"><![CDATA[
+        nsDragAndDrop.drop(event, this);
+      ]]></handler>
+    </handlers>
+  </binding>
+
+  <binding id="findbar"
+           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
+    <resources>
+      <stylesheet src="chrome://global/skin/findBar.css"/>
+    </resources>
+
+    <content align="center" hidden="true">
+      <xul:toolbarbutton anonid="find-closebutton"
+                         class="findbar-closebutton"
+                         tooltiptext="&findCloseButton.tooltip;"
+                         oncommand="close();"/>
+      <xul:label anonid="find-label" class="findbar-find-fast"/>
+      <xul:hbox anonid="find-field-container"
+                class="find-field-container findbar-find-fast">
+        <xul:textbox class="findbar-textbox" anonid="findbar-textbox"/>
+      </xul:hbox>
+      <xul:toolbarbutton anonid="find-next"
+                         class="findbar-find-next"
+                         label="&next.label;"
+                         accesskey="&next.accesskey;"
+                         tooltiptext="&next.tooltip;"
+                         oncommand="onFindAgainCommand(false);"
+                         disabled="true"
+                         xbl:inherits="accesskey=findnextaccesskey"/>
+      <xul:toolbarbutton anonid="find-previous"
+                         class="findbar-find-previous"
+                         label="&previous.label;"
+                         accesskey="&previous.accesskey;"
+                         tooltiptext="&previous.tooltip;"
+                         oncommand="onFindAgainCommand(true);"
+                         disabled="true"
+                         xbl:inherits="accesskey=findpreviousaccesskey"/>
+      <xul:toolbarbutton anonid="highlight"
+                         class="findbar-highlight"
+                         label="&highlight.label;"
+                         accesskey="&highlight.accesskey;"
+                         tooltiptext="&highlight.tooltiptext;"
+                         oncommand="toggleHighlight(!this.checked);"
+                         type="checkbox"
+                         disabled="true"
+                         xbl:inherits="accesskey=highlightaccesskey"/>
+      <xul:checkbox anonid="find-case-sensitive"
+                    oncommand="_setCaseSensitivity(this.checked);"
+                    label="&caseSensitiveCheckbox.label;"
+                    accesskey="&caseSensitiveCheckbox.accesskey;"
+                    xbl:inherits="accesskey=matchcaseaccesskey"/>
+      <xul:label anonid="match-case-status" class="findbar-find-fast"/>
+      <xul:image anonid="find-status-icon" class="find-status-icon"/>
+      <xul:label anonid="find-status" class="findbar-find-status"/>
+    </content>
+
+    <implementation implements="nsIDOMEventListener">
+      <field name="FIND_NORMAL">0</field>
+      <field name="FIND_TYPEAHEAD">1</field>
+      <field name="FIND_LINKS">2</field>
+
+      <field name="_findMode">0</field>
+      <field name="_tmpOutline">null</field>
+      <field name="_tmpOutlineOffset">"0"</field>
+      <field name="_drawOutline">false</field>
+
+      <field name="_flashFindBar">0</field>
+      <field name="_initialFlashFindBarCount">6</field>
+
+      <method name="getElement">
+        <parameter name="aAnonymousID"/>
+        <body><![CDATA[
+          return document.getAnonymousElementByAttribute(this,
+                                                         "anonid",
+                                                         aAnonymousID)
+        ]]></body>
+      </method>
+
+      <property name="findMode"
+                readonly="true"
+                onget="return this._findMode;"/>
+
+      <field name="_browser">null</field>
+      <property name="browser">
+        <getter><![CDATA[
+          return this._browser;
+        ]]></getter>
+        <setter><![CDATA[
+          if (this._browser) {
+            this._browser.removeEventListener("keypress", this, false);
+            this._browser.removeEventListener("mouseup", this, false);
+            this._foundLink = null;
+            this._foundEditable = null;
+            this._currentWindow = null;
+          }
+
+          this._browser = val;
+          if (this._browser) {
+            this._browser.addEventListener("keypress", this, false);
+            this._browser.addEventListener("mouseup", this, false);
+            this._findField.value = this._browser.fastFind.searchString;
+          }
+          return val;
+        ]]></setter>
+      </property>
+
+      <field name="_observer"><![CDATA[({
+        _self: this,
+
+        QueryInterface: function(aIID) {
+          if (aIID.equals(Components.interfaces.nsIObserver) ||
+              aIID.equals(Components.interfaces.nsISupportsWeakReference) ||
+              aIID.equals(Components.interfaces.nsISupports))
+            return this;
+
+          throw Components.results.NS_ERROR_NO_INTERFACE;
+        },
+
+        observe: function(aSubject, aTopic, aPrefName) {
+          if (aTopic != "nsPref:changed")
+            return;
+
+          var prefsvc =
+            aSubject.QueryInterface(Components.interfaces.nsIPrefBranch2);
+
+          switch (aPrefName) {
+            case "accessibility.typeaheadfind":
+              this._self._useTypeAheadFind = prefsvc.getBoolPref(aPrefName);
+              break;
+            case "accessibility.typeaheadfind.linksonly":
+              this._self._typeAheadLinksOnly = prefsvc.getBoolPref(aPrefName);
+              break;
+            case "accessibility.typeaheadfind.casesensitive":
+              this._self._typeAheadCaseSensitive = prefsvc.getIntPref(aPrefName);
+              this._self._updateCaseSensitivity();
+              break;
+          }
+        }
+      })]]></field>
+
+      <constructor><![CDATA[
+        // These elements are accessed frequently and are therefore cached
+        this._findField = this.getElement("findbar-textbox");
+        this._findStatusIcon = this.getElement("find-status-icon");
+        this._findStatusLabel = this.getElement("find-status");
+
+        var prefsvc =
+          Components.classes["@mozilla.org/preferences-service;1"]
+                    .getService(Components.interfaces.nsIPrefBranch2);
+
+        this._quickFindTimeoutLength =
+          prefsvc.getIntPref("accessibility.typeaheadfind.timeout");
+        this._flashFindBar =
+          prefsvc.getIntPref("accessibility.typeaheadfind.flashBar");
+
+        prefsvc.addObserver("accessibility.typeaheadfind",
+                            this._observer, false);
+        prefsvc.addObserver("accessibility.typeaheadfind.linksonly",
+                            this._observer, false);
+        prefsvc.addObserver("accessibility.typeaheadfind.casesensitive",
+                            this._observer, false);
+
+        this._useTypeAheadFind =
+          prefsvc.getBoolPref("accessibility.typeaheadfind");
+        this._typeAheadLinksOnly =
+          prefsvc.getBoolPref("accessibility.typeaheadfind.linksonly");
+        this._typeAheadCaseSensitive =
+          prefsvc.getIntPref("accessibility.typeaheadfind.casesensitive");
+
+        // Convenience
+        this.nsITypeAheadFind = Components.interfaces.nsITypeAheadFind;
+        this.nsISelectionController = Components.interfaces.nsISelectionController;
+
+        var _delayedInit = function(aSelf) {
+          // The browser element might be bound after the findbar
+          if (aSelf.hasAttribute("browserid")) {
+            aSelf.browser =
+              document.getElementById(aSelf.getAttribute("browserid"));
+          }
+        };
+        setTimeout(_delayedInit, 0, this);
+      ]]></constructor>
+
+      <destructor><![CDATA[
+        this.browser = null;
+
+        var prefsvc =
+          Components.classes["@mozilla.org/preferences-service;1"]
+                    .getService(Components.interfaces.nsIPrefBranch2);
+        prefsvc.removeObserver("accessibility.typeaheadfind",
+                               this._observer);
+        prefsvc.removeObserver("accessibility.typeaheadfind.linksonly",
+                               this._observer);
+        prefsvc.removeObserver("accessibility.typeaheadfind.casesensitive",
+                               this._observer);
+      ]]></destructor>
+
+      <method name="_setFindCloseTimeout">
+        <body><![CDATA[
+          if (this._quickFindTimeout)
+            clearTimeout(this._quickFindTimeout);
+
+          // Don't close the find toolbar while IME is composing.
+          if (this._isIMEComposing) {
+            this._quickFindTimeout = null;
+            return;
+          }
+
+          this._quickFindTimeout =
+            setTimeout(function(aSelf) {
+                         if (aSelf._findMode != aSelf.FIND_NORMAL)
+                           aSelf.close();
+                       }, this._quickFindTimeoutLength, this);
+        ]]></body>
+      </method>
+
+      <!--
+        - Turns highlight on or off.
+        - @param aHighlight (boolean)
+        -        Whether to turn on highlight
+        -->
+      <method name="toggleHighlight">
+        <parameter name="aHighlight"/>
+        <body><![CDATA[
+          var word = this._findField.value;
+          if (aHighlight) {
+            // We have to update the status because we might still have the status
+            // of another tab
+            if (this._highlightDoc("yellow", "black", word))
+              this._updateStatusUI(this.nsITypeAheadFind.FIND_FOUND);
+            else
+              this._updateStatusUI(this.nsITypeAheadFind.FIND_NOTFOUND);
+          }
+          else {
+            this._highlightDoc(null, null, null);
+            this._lastHighlightString = null;
+          }
+        ]]></body>
+      </method>
+
+      <!--
+        - (Un)highlights each instance of the searched word in the passed
+        - window's content.
+        - @param aHighBackColor
+        -        the background color for the highlight
+        - @param aHighTextColor
+        -        the text color for the highlight, or null to make it
+        -        unhighlight
+        - @param aWord
+        -        the word to search for
+        - @param aWindow
+        -        the window to search in. Passing undefined will search the
+        -        current content window.
+        - @returns true if aWord was found
+        -->
+      <method name="_highlightDoc">
+        <parameter name="aHighBackColor"/>
+        <parameter name="aHighTextColor"/>
+        <parameter name="aWord"/>
+        <parameter name="aWindow"/>
+        <body><![CDATA[
+          var win = aWindow ? aWindow : this._browser.contentWindow;
+
+          var textFound = false;
+          for (var i = 0; win.frames && i < win.frames.length; i++) {
+            if (this._highlightDoc(aHighBackColor, aHighTextColor, aWord, win.frames[i]))
+              textFound = true;
+          }
+
+          var doc = win.document;
+          if (!doc || !(doc instanceof HTMLDocument))
+            return textFound;
+
+          var body = doc.body;
+
+          var count = body.childNodes.length;
+          this._searchRange = doc.createRange();
+          this._startPt = doc.createRange();
+          this._endPt = doc.createRange();
+
+          this._searchRange.setStart(body, 0);
+          this._searchRange.setEnd(body, count);
+
+          this._startPt.setStart(body, 0);
+          this._startPt.setEnd(body, 0);
+          this._endPt.setStart(body, count);
+          this._endPt.setEnd(body, count);
+
+          if (!aHighBackColor) {
+            // Remove highlighting.  We use the find API again rather than
+            // searching for our span elements so that we gain access to the
+            // anonymous content that nsIFind searches.
+
+            if (!this._lastHighlightString)
+              return textFound;
+
+            var retRange = null;
+            var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"]
+                                   .createInstance(Components.interfaces.nsIFind);
+
+            while ((retRange = finder.Find(this._lastHighlightString,
+                                           this._searchRange, this._startPt,
+                                           this._endPt))) {
+              var startContainer = retRange.startContainer;
+              var elem = null;
+              try {
+                elem = startContainer.parentNode;
+              }
+              catch (ex) { }
+
+              if (elem && elem.className == "__mozilla-findbar-search") {
+                var child = null;
+                var docfrag = doc.createDocumentFragment();
+                var next = elem.nextSibling;
+                var parent = elem.parentNode;
+
+                while ((child = elem.firstChild)) {
+                  docfrag.appendChild(child);
+                }
+
+                this._startPt = doc.createRange();
+                this._startPt.setStartAfter(elem);
+
+                parent.removeChild(elem);
+                parent.insertBefore(docfrag, next);
+                parent.normalize();
+              }
+              else {
+                // Somehow we didn't highlight this instance; just skip it.
+                this._startPt = doc.createRange();
+                this._startPt.setStart(retRange.endContainer,
+                                       retRange.endOffset);
+              }
+
+              this._startPt.collapse(true);
+
+              textFound = true;
+            }
+            return textFound;
+          }
+
+          var baseNode = doc.createElementNS("http://www.w3.org/1999/xhtml", "span");
+          baseNode.style.backgroundColor = aHighBackColor;
+          baseNode.style.color = aHighTextColor;
+          baseNode.style.display = "inline";
+          baseNode.style.fontSize = "inherit";
+          baseNode.style.padding = "0";
+          baseNode.className = "__mozilla-findbar-search";
+
+          return this._highlightText(aWord, baseNode) || textFound;
+        ]]></body>
+      </method>
+
+      <!--
+        - Highlights each instance of the searched word in the current range.
+        -
+        - @param aWord
+        -        the word to search for.
+        - @param aBaseNode
+        -        a node to use as a template for what will replace the searched
+        -        word.
+        - @returns true if aWord was found
+        -->
+      <method name="_highlightText">
+        <parameter name="aWord"/>
+        <parameter name="aBaseNode"/>
+        <body><![CDATA[
+          var retRange = null;
+          var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"]
+                                 .createInstance()
+                                 .QueryInterface(Components.interfaces.nsIFind);
+
+          finder.caseSensitive = this._shouldBeCaseSensitive(aWord);
+
+          var textFound = false;
+          while((retRange = finder.Find(aWord, this._searchRange,
+                                        this._startPt, this._endPt))) {
+            // Highlight
+            var nodeSurround = aBaseNode.cloneNode(true);
+            var node = this._highlight(retRange, nodeSurround);
+            this._startPt = node.ownerDocument.createRange();
+            this._startPt.setStart(node, node.childNodes.length);
+            this._startPt.setEnd(node, node.childNodes.length);
+
+            textFound = true;
+          }
+
+          this._lastHighlightString = aWord;
+
+          return textFound;
+        ]]></body>
+      </method>
+
+     <!--
+       - Highlights the word in the passed range.
+       -
+       - @param aRange
+       -        the range that contains the word to highlight
+       - @param aNode
+       -        the node replace the searched word with
+       - @returns the node that replaced the searched word
+       -->
+      <method name="_highlight">
+        <parameter name="aRange"/>
+        <parameter name="aNode"/>
+        <body><![CDATA[
+          var startContainer = aRange.startContainer;
+          var startOffset = aRange.startOffset;
+          var endOffset = aRange.endOffset;
+          var docfrag = aRange.extractContents();
+          var before = startContainer.splitText(startOffset);
+          var parent = before.parentNode;
+          aNode.appendChild(docfrag);
+          parent.insertBefore(aNode, before);
+          return aNode;
+        ]]></body>
+      </method>
+
+      <!--
+        - Updates the case-sensitivity mode of the findbar and its UI.
+        - @param [optional] aString
+        -        The string for which case sensitivity might be turned on.
+        -        This only used when case-sensitivity is in auto mode,
+        -        @see _shouldBeCaseSensitive. The default value for this
+        -        parameter is the find-field value.
+        -->
+      <method name="_updateCaseSensitivity">
+        <parameter name="aString"/>
+        <body><![CDATA[
+          var val = aString ? aString : this._findField.value;
+
+          var caseSensitive = this._shouldBeCaseSensitive(val);
+          var checkbox = this.getElement("find-case-sensitive");
+          var statusLabel = this.getElement("match-case-status");
+          checkbox.checked = caseSensitive;
+
+          statusLabel.value = caseSensitive ? this._caseSensitiveStr : "";
+
+          // Show the checkbox on the full Find bar in non-auto mode.
+          // Show the label in all other cases.
+          var hideCheckbox = this._findMode != this.FIND_NORMAL ||
+            (this._typeAheadCaseSensitive != 0 &&
+             this._typeAheadCaseSensitive != 1);
+          checkbox.hidden = hideCheckbox;
+          statusLabel.hidden = !hideCheckbox;
+
+          var fastFind = this._browser.fastFind;
+          fastFind.caseSensitive = caseSensitive;
+        ]]></body>
+      </method>
+
+      <!--
+        - Sets the findbar case-sensitivity mode
+        - @param aCaseSensitive (boolean)
+        -        Whether or not case-sensitivity should be turned on.
+        -->
+      <method name="_setCaseSensitivity">
+        <parameter name="aCaseSensitive"/>
+        <body><![CDATA[
+          var prefsvc =
+            Components.classes["@mozilla.org/preferences-service;1"]
+                      .getService(Components.interfaces.nsIPrefBranch2);
+
+          // Just set the pref; our observer will change the find bar behavior
+          prefsvc.setIntPref("accessibility.typeaheadfind.casesensitive",
+                             aCaseSensitive ? 1 : 0);
+        ]]></body>
+      </method>
+
+      <!--
+        - Opens and displays the find bar.
+        -
+        - @param aMode
+        -        the find mode to be used, which is either FIND_NORMAL,
+        -        FIND_TYPEAHEAD or FIND_LINKS. If not passed, the last
+        -        find mode if any or FIND_NORMAL.
+        - @returns true if the find bar wasn't previously open, false otherwise.
+        -->
+      <method name="open">
+        <parameter name="aMode"/>
+        <body><![CDATA[
+          if (aMode != undefined)
+            this._findMode = aMode;
+
+          if (!this._notFoundStr) {
+            var stringsBundle =
+              Components.classes["@mozilla.org/intl/stringbundle;1"]
+                        .getService(Components.interfaces.nsIStringBundleService)
+                        .createBundle("chrome://global/locale/findbar.properties");
+            this._notFoundStr = stringsBundle.GetStringFromName("NotFound");
+            this._wrappedToTopStr =
+              stringsBundle.GetStringFromName("WrappedToTop");
+            this._wrappedToBottomStr =
+              stringsBundle.GetStringFromName("WrappedToBottom");
+            this._normalFindStr =
+              stringsBundle.GetStringFromName("NormalFindLabel");
+            this._fastFindStr =
+              stringsBundle.GetStringFromName("FastFindLabel");
+            this._caseSensitiveStr =
+              stringsBundle.GetStringFromName("CaseSensitive");
+          }
+
+          this._updateFindUI();
+          if (this.hidden) {
+            this.hidden = false;
+
+            this._updateCaseSensitivity(this._findField.value);
+            this._updateStatusUI(this.nsITypeAheadFind.FIND_FOUND);
+
+            return true;
+          }
+          return false;
+        ]]></body>
+      </method>
+
+      <!--
+        - Closes the findbar.
+        -->
+      <method name="close">
+        <body><![CDATA[
+          var ww =
+            Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                      .getService(Components.interfaces.nsIWindowWatcher);
+          if (window == ww.activeWindow) {
+            var focusedElement = document.commandDispatcher.focusedElement;
+            if (focusedElement) {
+              var bindingParent = document.getBindingParent(focusedElement);
+              if (bindingParent == this || bindingParent == this._findField) {
+                // block scrolling on focus since find already scrolls, further
+                // scrolling is due to user action, so don't override this
+                var suppressedScroll = document.commandDispatcher.suppressFocusScroll;
+                document.commandDispatcher.suppressFocusScroll = true;
+                // We MUST reset suppressFocusScroll.
+                try {
+                  if (this._foundLink)
+                    this._foundLink.focus();
+                  else if (this._foundEditable)
+                    this._foundEditable.focus();
+                  else if (this._currentWindow)
+                    this._currentWindow.focus();
+                  else
+                    this._browser.contentWindow.focus();
+                }
+                catch(ex) {
+                  // Retry to set focus.
+                  try {
+                    this._browser.contentWindow.focus();
+                  }
+                  catch(e) { /* We lose focused element! */ }
+                }
+                document.commandDispatcher.suppressFocusScroll = suppressedScroll;
+              }
+            }
+          }
+
+          this.hidden = true;
+          var fastFind = this._browser.fastFind;
+          fastFind.setSelectionModeAndRepaint
+            (this.nsISelectionController.SELECTION_ON);
+          this._setFoundLink(null);
+          this._foundEditable = null;
+          this._currentWindow = null;
+          if (this._quickFindTimeout) {
+            clearTimeout(this._quickFindTimeout);
+            this._quickFindTimeout = null;
+          }
+        ]]></body>
+      </method>
+
+      <method name="_dispatchKeypressEvent">
+        <parameter name="aTarget"/>
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (!aTarget)
+            return;
+
+          var event = document.createEvent("KeyEvents");
+          event.initKeyEvent(aEvent.type, aEvent.bubbles, aEvent.cancelable,
+                             aEvent.view, aEvent.ctrlKey, aEvent.altKey,
+                             aEvent.shiftKey, aEvent.metaKey, aEvent.keyCode,
+                             aEvent.charCode);
+          aTarget.dispatchEvent(event);
+        ]]></body>
+      </method>
+
+      <field name="_xulBrowserWindow">null</field>
+      <method name="_updateStatusUIBar">
+        <body><![CDATA[
+          if (!this._xulBrowserWindow) {
+            try {
+              this._xulBrowserWindow =
+                window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                      .getInterface(Components.interfaces.nsIWebNavigation)
+                      .QueryInterface(Components.interfaces.nsIDocShellTreeItem)
+                      .treeOwner
+                      .QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                      .getInterface(Components.interfaces.nsIXULWindow)
+                      .XULBrowserWindow;
+            }
+            catch(ex) { }
+            if (!this._xulBrowserWindow)
+              return false;
+          }
+
+          if (!this._foundLink || !this._foundLink.href ||
+              this._foundLink.href == "") {
+            this._xulBrowserWindow.setOverLink("", null);
+            return true;
+          }
+
+          var docCharset = "";
+          var ownerDoc = this._foundLink.ownerDocument;
+          if (ownerDoc)
+            docCharset = ownerDoc.characterSet;
+
+          if (!this._textToSubURIService) {
+            this._textToSubURIService =
+              Components.classes["@mozilla.org/intl/texttosuburi;1"]
+                        .getService(Components.interfaces.nsITextToSubURI);
+          }
+          var url =
+            this._textToSubURIService.unEscapeURIForUI(docCharset,
+                                                       this._foundLink.href);
+          this._xulBrowserWindow.setOverLink(url, null);
+
+          return true;
+        ]]></body>
+      </method>
+
+      <method name="_setFoundLink">
+        <parameter name="aFoundLink"/>
+        <body><![CDATA[
+          if (this._foundLink == aFoundLink)
+            return;
+
+          if (this._foundLink && this._drawOutline) {
+            // restore original outline
+            this._foundLink.style.outline = this._tmpOutline;
+            this._foundLink.style.outlineOffset = this._tmpOutlineOffset;
+          }
+          this._drawOutline = (aFoundLink && this._findMode != this.FIND_NORMAL);
+          if (this._drawOutline) {
+            // backup original outline
+            this._tmpOutline = aFoundLink.style.outline;
+            this._tmpOutlineOffset = aFoundLink.style.outlineOffset;
+
+            // draw pseudo focus rect
+            // XXX Should we change the following style for FAYT pseudo focus?
+            // XXX Shouldn't we change default design if outline is visible
+            //     already?
+            aFoundLink.style.outline = "1px dotted invert";
+            aFoundLink.style.outlineOffset = "0";
+          }
+
+          this._foundLink = aFoundLink;
+
+          // If the mouse cursor is on the document, the status bar text is
+          // changed by a mouse event which is dispatched by a scroll event.
+          // Thus we should change it only after the mouse event is dispatched.
+          if (this._findMode != this.FIND_NORMAL)
+            setTimeout(function(aSelf) { aSelf._updateStatusUIBar(); }, 0, this);
+        ]]></body>
+      </method>
+
+      <method name="_finishFAYT">
+        <parameter name="aKeypressEvent"/>
+        <body><![CDATA[
+          try {
+            if (this._foundLink)
+              this._foundLink.focus();
+            else if (this._foundEditable) {
+              this._foundEditable.focus();
+              var fastFind = this._browser.fastFind;
+              fastFind.collapseSelection();
+            }
+            else if (this._currentWindow)
+              this._currentWindow.focus();
+            else
+              return false;
+          }
+          catch(e) {
+            return false;
+          }
+
+          if (aKeypressEvent)
+            aKeypressEvent.preventDefault();
+
+          this.close();
+          return true;
+        ]]></body>
+      </method>
+
+      <!--
+        - Returns whether FAYT can be used for the given event in
+        - the current content state.
+        -->
+      <method name="_shouldFastFind">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          if (aEvent.ctrlKey || aEvent.altKey || aEvent.metaKey ||
+              aEvent.getPreventDefault())
+            return false;
+
+          var elt = document.commandDispatcher.focusedElement;
+          if (elt) {
+            if (elt instanceof HTMLInputElement) {
+              // block FAYT when an <input> textfield element is focused
+              var inputType = elt.type;
+              switch (inputType) {
+                case "text":
+                case "password":
+                case "file":
+                  return false;
+              }
+            }
+            else if (elt instanceof HTMLTextAreaElement ||
+                     elt instanceof HTMLSelectElement ||
+                     elt instanceof HTMLIsIndexElement ||
+                     elt instanceof HTMLObjectElement ||
+                     elt instanceof HTMLEmbedElement)
+              return false;
+          }
+
+          // disable FAYT in about:config and about:blank to prevent FAYT
+          // opening unexpectedly - to fix bugs 264562, 267150, 269712
+          var url = this._browser.currentURI.spec;
+          if (url == "about:blank" || url == "about:config")
+            return false;
+
+          var win = document.commandDispatcher.focusedWindow;
+          if (win && win.document.designMode == "on")
+            return false;
+
+          return true;
+        ]]></body>
+      </method>
+
+      <method name="_shouldBeCaseSensitive">
+        <parameter name="aString"/>
+        <body><![CDATA[
+          if (this._typeAheadCaseSensitive == 0)
+            return false;
+          if (this._typeAheadCaseSensitive == 1)
+            return true;
+
+          return aString != aString.toLowerCase();
+        ]]></body>
+      </method>
+
+      <method name="_onBrowserKeypress">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          const TAF_LINKS_KEY = "'";
+          const TAF_TEXT_KEY = "/";
+
+          if (!this._shouldFastFind(aEvent))
+            return;
+
+          if (this._findMode != this.FIND_NORMAL && this._quickFindTimeout) {
+            if (!aEvent.charCode)
+              return;
+
+            this._findField.select();
+            this._findField.focus();
+            this._dispatchKeypressEvent(this._findField.inputField, aEvent);
+            aEvent.preventDefault();
+            return;
+          }
+
+          var key = aEvent.charCode ? String.fromCharCode(aEvent.charCode) : null;
+          var manualstartFAYT = (key == TAF_LINKS_KEY || key == TAF_TEXT_KEY);
+          var autostartFAYT = !manualstartFAYT && this._useTypeAheadFind &&
+                              key && key != " ";
+          if (manualstartFAYT || autostartFAYT) {
+            var mode = (key == TAF_LINKS_KEY ||
+                        (autostartFAYT && this._typeAheadLinksOnly)) ?
+              this.FIND_LINKS : this.FIND_TYPEAHEAD;
+
+            // Clear bar first, so that when openFindBar() calls setCaseSensitivity()
+            // it doesn't get confused by a lingering value
+            this._findField.value = "";
+
+            this.open(mode);
+            this._setFindCloseTimeout();
+            this._findField.select();
+            this._findField.focus();
+
+            if (autostartFAYT)
+              this._dispatchKeypressEvent(this._findField.inputField, aEvent);
+            else
+              this._updateStatusUI(this.nsITypeAheadFind.FIND_FOUND);
+
+            aEvent.preventDefault();
+          }
+        ]]></body>
+      </method>
+
+      <!-- See nsIDOMEventListener -->
+      <method name="handleEvent">
+        <parameter name="aEvent"/>
+        <body><![CDATA[
+          switch (aEvent.type) {
+            case "mouseup":
+              if (!this.hidden && this._findMode != this.FIND_NORMAL)
+                this.close();
+
+              break;
+            case "keypress":
+              this._onBrowserKeypress(aEvent);
+              break;
+          }
+        ]]></body>
+      </method>
+
+      <method name="_enableFindButtons">
+        <parameter name="aEnable"/>
+        <body><![CDATA[
+          this.getElement("find-next").disabled =
+            this.getElement("find-previous").disabled =
+            this.getElement("highlight").disabled = !aEnable;
+        ]]></body>
+      </method>
+
+      <!--
+        - Determines whether minimalist or general-purpose search UI is to be
+        - displayed when the find bar is activated.
+        -->
+      <method name="_updateFindUI">
+        <body><![CDATA[
+          var showMinimalUI = this._findMode != this.FIND_NORMAL;
+
+          var nodes = document.getAnonymousNodes(this);
+          for (var i = 0; i < nodes.length; i++) {
+            if (nodes[i].className.indexOf("findbar-find-fast") != -1)
+               continue;
+
+            nodes[i].hidden = showMinimalUI;
+          }
+
+          this.getElement("find-label").value = showMinimalUI ?
+            this._fastFindStr : this._normalFindStr;
+        ]]></body>
+      </method>
+
+      <method name="_updateFoundLink">
+        <parameter name="res"/>
+        <body><![CDATA[
+          var val = this._findField.value;
+          if (res == this.nsITypeAheadFind.FIND_NOTFOUND || !val) {
+            this._setFoundLink(null);
+            this._foundEditable = null;
+            this._currentWindow = null;
+          }
+          else {
+            this._setFoundLink(this._browser.fastFind.foundLink);
+            this._foundEditable = this._browser.fastFind.foundEditable;
+            this._currentWindow = this._browser.fastFind.currentWindow;
+          }
+        ]]></body>
+      </method>
+
+      <method name="_find">
+        <parameter name="aValue"/>
+        <body><![CDATA[
+          var val = aValue ? aValue : this._findField.value
+
+          this._enableFindButtons(val);
+          if (this.getElement("highlight").checked)
+            this._setHighlightTimeout();
+
+          this._updateCaseSensitivity(val);
+
+          var fastFind = this._browser.fastFind;
+          var res = fastFind.find(val,
+                                  this._findMode == this.FIND_LINKS,
+                                  this._findField.getAttribute("focused") == "true");
+          this._updateFoundLink(res);
+          this._updateStatusUI(res, false);
+
+          if (this._findMode != this.FIND_NORMAL)
+            this._setFindCloseTimeout();
+        ]]></body>
+      </method>
+
+      <method name="_flash">
+        <body><![CDATA[
+          if (this._flashFindBarCount === undefined)
+            this._flashFindBarCount = this._initialFlashFindBarCount;
+
+          if (this._flashFindBarCount-- == 0) {
+            clearInterval(this._flashFindBarTimeout);
+            this.removeAttribute("flash");
+            this._flashFindBarCount = 6;
+            return;
+          }
+
+          this.setAttribute("flash",
+                            (this._flashFindBarCount % 2 == 0) ?
+                            "false" : "true");
+        ]]></body>
+      </method>
+
+      <method name="_setHighlightTimeout">
+        <body><![CDATA[
+          if (this._highlightTimeout)
+            clearTimeout(this._highlightTimeout);
+          this._highlightTimeout =
+            setTimeout(function(aSelf) {
+                         aSelf.toggleHighlight(false);
+                         aSelf.toggleHighlight(true);
+                       }, 500, this);
+        ]]></body>
+      </method>
+
+      <method name="_findAgain">
+        <parameter name="aFindPrevious"/>
+        <body><![CDATA[
+          var fastFind = this._browser.fastFind;
+          var findFieldFocused =  this._findField.getAttribute("focused") == "true";
+          var res = fastFind.findAgain(aFindPrevious, findFieldFocused);
+          this._updateFoundLink(res);
+          this._updateStatusUI(res, aFindPrevious);
+
+          if (this._findMode != this.FIND_NORMAL && !this.hidden)
+            this._setFindCloseTimeout();
+
+          return res;
+        ]]></body>
+      </method>
+
+      <method name="_updateStatusUI">
+        <parameter name="res"/>
+        <parameter name="aFindPrevious"/>
+        <body><![CDATA[
+          switch (res) {
+            case this.nsITypeAheadFind.FIND_WRAPPED:
+              this._findStatusIcon.setAttribute("status", "wrapped");
+              this._findStatusLabel.value =
+                aFindPrevious ? this._wrappedToBottomStr : this._wrappedToTopStr;
+              break;
+            case this.nsITypeAheadFind.FIND_NOTFOUND:
+              this._findStatusIcon.setAttribute("status", "notfound");
+              this._findStatusLabel.value = this._notFoundStr;
+              this._findField.setAttribute("status", "notfound");
+              break;
+            case this.nsITypeAheadFind.FIND_FOUND:
+            default:
+              this._findStatusIcon.removeAttribute("status");
+              this._findStatusLabel.value = "";
+              this._findField.removeAttribute("status");
+              break;
+          }
+        ]]></body>
+      </method>
+
+      <!--
+        - Opens the findbar, focuses the findfield and selects its contents.
+        - Also flashes the findbar the first time it's used.
+        - @param aMode
+        -        the find mode to be used, which is either FIND_NORMAL,
+        -        FIND_TYPEAHEAD or FIND_LINKS. If not passed, the last
+        -        find mode if any or FIND_NORMAL.
+        -->
+      <method name="startFind">
+        <parameter name="aMode"/>
+        <body><![CDATA[
+          this.open(aMode);
+          if (this._flashFindBar) {
+            this._flashFindBarTimeout =
+              setInterval(function(aSelf) { aSelf._flash(); }, 500, this);
+            var prefsvc =
+              Components.classes["@mozilla.org/preferences-service;1"]
+                        .getService(Components.interfaces.nsIPrefBranch2);
+
+            prefsvc.setIntPref("accessibility.typeaheadfind.flashBar",
+                               --this._flashFindBar);
+          }
+
+          this._findField.select();
+          this._findField.focus();
+        ]]></body>
+      </method>
+
+      <!--
+        - Convenient alias to startFind(gFindBar.FIND_NORMAL);
+        -
+        - You should generally map the window's find command to this method.
+        -   e.g. <command name="cmd_find" oncommand="gFindBar.onFindCommand();"/>
+        -->
+      <method name="onFindCommand">
+        <body><![CDATA[
+          this.startFind(this.FIND_NORMAL);
+        ]]></body>
+      </method>
+
+      <!--
+        - Stub for find-next and find-previous commands
+        - @param aFindPrevious
+        -        true for find-previous, false otherwise.
+        -->
+      <method name="onFindAgainCommand">
+        <parameter name="aFindPrevious"/>
+        <body><![CDATA[
+          var findString = this._browser.fastFind.searchString;
+          if (!findString) {
+            this.startFind();
+            return;
+          }
+
+          var res = this._findAgain(aFindPrevious);
+          if (res == this.nsITypeAheadFind.FIND_NOTFOUND) {
+            if (this.open()) {
+              if (this._findMode != this.FIND_NORMAL)
+                this._setFindCloseTimeout();
+              this._findField.focus();
+              this._findField.focus();
+              this._updateStatusUI(res, aFindPrevious);
+            }
+          }
+        ]]></body>
+      </method>
+    </implementation>
+
+    <handlers>
+      <handler event="keypress" keycode="VK_ESCAPE" phase="capturing" action="this.close();" preventdefault="true"/>
+    </handlers>
+  </binding>
+</bindings>
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index f0b4757847a..4f8a47a22e5 100644
--- 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');
+}
diff --git a/toolkit/themes/pinstripe/global/findBar.css b/toolkit/themes/pinstripe/global/findBar.css
index 09db77302e1..770882b9e7b 100644
--- 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;
+}
diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index 0c094172134..47490458c6b 100644
--- 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)
diff --git a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-left.png b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..c98b6a47e12b91b8dc47215869dcc29fc18c4491
GIT binary patch
literal 3072
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
O0000<MNUMnLSTaCf2ZyM

literal 0
HcmV?d00001

diff --git a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-mid.png b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-mid.png
new file mode 100644
index 0000000000000000000000000000000000000000..b267091f655ebaa26d9ef4485a8b4986b43b0026
GIT binary patch
literal 2841
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

literal 0
HcmV?d00001

diff --git a/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png b/toolkit/themes/pinstripe/global/toolbar/toolbarbutton-customhover-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..33ee8a66cbb7cbd807a43d399caad0f02a4e448a
GIT binary patch
literal 4536
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
W^*T9ArvU5#0000<MNUMnLSTXo!HtIi

literal 0
HcmV?d00001

diff --git a/toolkit/themes/winstripe/global/findBar.css b/toolkit/themes/winstripe/global/findBar.css
index 1e7eb64d604..2c2ddcd6870 100755
--- 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;
 }