Bug 1389740 - Remove urlbar-wrapper. r=gijs

MozReview-Commit-ID: 7Kau6bgiqr2

browser/base/content/browser.xul

@@ -781,7 +781,6 @@
         <toolbaritem id="urlbar-container" flex="400" persist="width"
                      removable="false"
                      class="chromeclass-location" overflows="false">
-          <hbox id="urlbar-wrapper" flex="1">
             <textbox id="urlbar" flex="1"
                      placeholder="&urlbar.placeholder2;"
                      type="autocomplete"
@@ -916,7 +915,6 @@
                 <image id="userContext-indicator"/>
               </hbox>
             </textbox>
-          </hbox>
         </toolbaritem>
 
         <toolbaritem id="search-container" title="&searchItem.title;"

browser/base/content/tabbrowser.xml

@@ -1150,10 +1150,9 @@
             this.mCurrentTab = this.tabContainer.selectedItem;
             this.showTab(this.mCurrentTab);
 
-            var forwardButtonContainer = document.getElementById("urlbar-wrapper");
-            forwardButtonContainer.setAttribute("switchingtabs", "true");
+            gURLBar.setAttribute("switchingtabs", "true");
             window.addEventListener("MozAfterPaint", function() {
-              forwardButtonContainer.removeAttribute("switchingtabs");
+              gURLBar.removeAttribute("switchingtabs");
             }, {once: true});
 
             this._appendStatusPanel();

browser/themes/linux/browser.css

@@ -259,7 +259,7 @@ menuitem.bookmark-item {
   -moz-appearance: toolbarbutton-dropdown;
   transition: opacity 0.15s ease;
 }
-#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#urlbar[switchingtabs] > .urlbar-textbox-container > .urlbar-history-dropmarker {
   transition: none;
 }
 

browser/themes/osx/browser.css

@@ -426,7 +426,7 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
   -moz-image-region: var(--urlbar-dropmarker-region);
   transition: opacity 0.15s ease;
 }
-#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#urlbar[switchingtabs] > .urlbar-textbox-container > .urlbar-history-dropmarker {
   transition: none;
 }
 

browser/themes/windows/browser.css

@@ -653,7 +653,7 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
   transition: opacity 0.15s ease;
 }
 
-#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker {
+#urlbar[switchingtabs] > .urlbar-textbox-container > .urlbar-history-dropmarker {
   transition: none;
 }