Bug 591490 - Move the search selector button to the right of the urlbar [r=vingtetun]

mobile/chrome/content/browser.xul

@@ -231,13 +231,12 @@
 #ifdef MOZ_PLATFORM_MAEMO
                   <toolbarbutton id="tool-app-switch" class="button-image" oncommand="BrowserUI.switchTask();"/>
 #endif
-                  <hbox id="urlbar-container" flex="1">
+                  <hbox id="urlbar-container" flex="1" observes="bcast_urlbarState">
                     <box id="identity-box"
                          onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
                          onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
-                      <box id="urlbar-image-box" mousethrough="always" observes="bcast_urlbarState">
+                      <box id="urlbar-image-box" mousethrough="always">
                         <image id="urlbar-throbber"/>
-                        <image id="urlbar-magnifier" hidden="true"/>
                         <image id="urlbar-favicon" hidden="true"/>
                       </box>
                     </box>
@@ -260,7 +259,7 @@
                       <toolbarbutton id="tool-reload" class="urlbar-cap-button"
                                      oncommand="CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload' : 'cmd_reload');"/>
                       <toolbarbutton id="tool-stop" class="urlbar-cap-button" command="cmd_stop"/>
-                      <toolbarbutton id="tool-go" class="urlbar-cap-button" command="cmd_go"/>
+                      <toolbarbutton id="tool-search" class="urlbar-cap-button" command="cmd_opensearch"/>
                     </hbox>
                   </hbox>
 #ifdef MOZ_PLATFORM_MAEMO

mobile/themes/core/browser.css

@@ -130,14 +130,6 @@ toolbarbutton.urlbar-cap-button {
   -moz-box-flex: 1;
 }
 
-#tool-go {
-  list-style-image: url("chrome://browser/skin/images/go-30.png");
-}
-
-#tool-go:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/images/go-rtl-30.png");
-}
-
 #tool-reload {
   list-style-image: url("chrome://browser/skin/images/reload-30.png");
 }
@@ -146,12 +138,16 @@ toolbarbutton.urlbar-cap-button {
   list-style-image: url("chrome://browser/skin/images/stop-30.png");
 }
 
-#urlbar-icons[mode="loading"] > #tool-go,
+#tool-search {
+  list-style-image: url("chrome://browser/skin/images/navigation-magnifier-30.png");
+}
+
+#urlbar-icons[mode="loading"] > #tool-search,
 #urlbar-icons[mode="loading"] > #tool-reload {
   visibility: collapse;
 }
 
-#urlbar-icons[mode="view"] > #tool-go,
+#urlbar-icons[mode="view"] > #tool-search,
 #urlbar-icons[mode="view"] > #tool-stop {
   visibility: collapse;
 }
@@ -228,23 +224,14 @@ toolbarbutton.urlbar-cap-button {
   background: url("images/rightcapSSL-active-64.png");
 }
 
-#urlbar-image-box[mode=edit] > #urlbar-favicon,
-#urlbar-image-box[mode=edit] > #urlbar-throbber {
-  display: none;
+#urlbar-container[mode="edit"] > #identity-box {
+  visibility: collapse;
 }
 
 #urlbar-throbber[loading] {
   list-style-image: url("chrome://browser/skin/images/throbber.png");
 }
 
-#urlbar-magnifier {
-  list-style-image: url("chrome://browser/skin/images/navigation-magnifier-30.png");
-}
-
-#urlbar-image-box[mode=edit] > #urlbar-magnifier {
-  display: block !important;
-}
-
 #urlbar-favicon {
   width: 32px;
   height: 32px;
@@ -276,7 +263,20 @@ toolbarbutton.urlbar-cap-button {
 
 #urlbar-edit > hbox > hbox > .textbox-input {
   min-height: 60px;
-  text-indent: 3px;
+  text-indent: 8px;
+}
+
+#urlbar-container[mode="edit"] > #urlbar-edit {
+  -moz-border-start: 3px solid #262629 !important;
+  -moz-border-radius-topleft: 10px;
+  -moz-border-radius-bottomleft: 10px;
+}
+
+#urlbar-container[mode="edit"] > #urlbar-edit:-moz-locale-dir(rtl) {
+  -moz-border-radius-topleft: 0;
+  -moz-border-radius-bottomleft: 0;
+  -moz-border-radius-topright: 10px;
+  -moz-border-radius-bottomright: 10px;
 }
 
 /* make sure this endcap matches the other endcap */

mobile/themes/core/jar.mn

@@ -42,8 +42,6 @@ chrome.jar:
   skin/images/folder-32.png                 (images/folder-32.png)
   skin/images/stop-30.png                   (images/stop-30.png)
   skin/images/reload-30.png                 (images/reload-30.png)
-  skin/images/go-30.png                     (images/go-30.png)
-  skin/images/go-rtl-30.png                 (images/go-rtl-30.png)
   skin/images/alert-addons-30.png           (images/alert-addons-30.png)
   skin/images/alert-downloads-30.png        (images/alert-downloads-30.png)
   skin/images/addons-default-64.png         (images/addons-default-64.png)