Bug 581097 - [Regression] Find Bar comes up in place of formfill [r=mfinkle]

mobile/chrome/content/browser.xul

@@ -277,7 +277,7 @@
         <vbox id="content-navigator" class="window-width" top="0" spacer="content-navigator-spacer">
           <arrowscrollbox id="form-helper-autofill" collapsed="true" align="center" flex="1" orient="horizontal"
                           onclick="FormHelperUI.doAutoComplete(event.target);"/>
-          <textbox id="select-helper-textbox" oncommand="SelectHelperUI.filter(this.value)" type="search" flex="1"/>
+          <textbox id="select-helper-textbox" oncommand="SelectHelperUI.filter(this.value)" type="search" flex="1" hidden="true"/>
           <textbox id="find-helper-textbox" oncommand="FindHelperUI.search(this.value)" oninput="FindHelperUI.updateCommands(this.value);" type="search" flex="1"/>
         </vbox>
       </stack>

mobile/locales/en-US/chrome/browser.properties

@@ -149,7 +149,7 @@ pageactions.geo=Location
 pageactions.popup=Popups
 pageactions.offline-app=Offline Storage
 pageactions.password=Password
-pageactions.findInPage=Find
+pageactions.findInPage=Find In Page
 
 # Helper App Dialog (Save/Open)
 helperApp.title=Opening File

mobile/themes/core/browser.css

@@ -1157,7 +1157,7 @@ pageaction .pageaction-desc[value=""] {
 
 #content-navigator > hbox > toolbarbutton.previous-button {
   height: 64px;
-  margin-right: 4px;
+  margin-right: 0;
   list-style-image: url("chrome://browser/skin/images/previous-default-64.png");
 }
 
@@ -1171,7 +1171,7 @@ pageaction .pageaction-desc[value=""] {
 
 #content-navigator > hbox > toolbarbutton.next-button {
   height: 64px;
-  margin-left: 4px;
+  margin-left: 0;
   list-style-image: url("chrome://browser/skin/images/next-default-64.png");
 }