Bug 452077: move bookmarks button to the titlebar, r=enndeakin

mobile/chrome/content/browser.xul

@@ -207,19 +207,19 @@
                  autocompletepopup="popup_autocomplete"
                  ontextentered="BrowserUI.goToURI();"
                  clickSelectsAll="true"/>
-      </hbox>
         <hbox id="urlbar-icons">
           <toolbarbutton id="tool-reload" class="urlbar-icon-button" command="cmd_reload"/>
           <toolbarbutton id="tool-stop" class="urlbar-icon-button" command="cmd_stop"/>
           <toolbarbutton id="tool-go" class="urlbar-icon-button" command="cmd_go"/>
         </hbox>
+      </hbox>
+      <toolbarbutton id="tool-bookmarks" class="browser-control-button" command="cmd_bookmarks"/>
     </toolbar>
 
     <vbox id="browser-controls" style="-moz-stack-sizing: ignore; width: 80px;" top="60" left="0">
       <toolbarbutton id="tool-back" class="browser-control-button" command="cmd_back"/>
       <toolbarbutton id="tool-forward" class="browser-control-button" command="cmd_forward"/>
       <toolbarbutton id="tool-star" class="browser-control-button" command="cmd_star"/>
-      <toolbarbutton id="tool-bookmarks" class="browser-control-button" command="cmd_bookmarks"/>
       <toolbarbutton id="tool-actions" class="browser-control-button" command="cmd_actions"/>
     </vbox>
 

mobile/chrome/skin/browser.css

@@ -161,18 +161,18 @@ toolbarbutton.browser-control-button {
   -moz-image-region: rect(0px 36px 36px 0px);
 }
 
-#toolbar-main[mode="loading"] > #urlbar-icons > #tool-go,
-#toolbar-main[mode="loading"] > #urlbar-icons > #tool-reload {
+#toolbar-main[mode="loading"] > #urlbar-container > #urlbar-icons > #tool-go,
+#toolbar-main[mode="loading"] > #urlbar-container > #urlbar-icons > #tool-reload {
   visibility: collapse;
 }
 
-#toolbar-main[mode="view"] > #urlbar-icons > #tool-go,
-#toolbar-main[mode="view"] > #urlbar-icons > #tool-stop {
+#toolbar-main[mode="view"] > #urlbar-container > #urlbar-icons > #tool-go,
+#toolbar-main[mode="view"] > #urlbar-container > #urlbar-icons > #tool-stop {
   visibility: collapse;
 }
 
-#toolbar-main[mode="edit"] > #urlbar-icons > #tool-reload,
-#toolbar-main[mode="edit"] > #urlbar-icons > #tool-stop {
+#toolbar-main[mode="edit"] > #urlbar-container > #urlbar-icons > #tool-reload,
+#toolbar-main[mode="edit"] > #urlbar-container > #urlbar-icons > #tool-stop {
   visibility: collapse;
 }