Bug 1119250 - remove old searchbar UI - part 4 - remove the oneoffui attribute, r=Mossop.
authorFlorian Quèze <florian@queze.net>
Fri, 04 Sep 2015 22:54:28 +0200
changeset 290590 98df8139f5b903e2f6a9d78c61dd93071401712c
parent 290589 d808114269ad684aa8b78d825b88ea3d7c916066
child 290591 7d6bfa28523eeee42b20a39cec35a0b576695cd8
push id5164
push userjryans@gmail.com
push dateMon, 07 Sep 2015 01:24:15 +0000
reviewersMossop
bugs1119250
milestone43.0a1
Bug 1119250 - remove old searchbar UI - part 4 - remove the oneoffui attribute, r=Mossop.
browser/components/search/content/search.xml
browser/components/search/test/browser.ini
browser/components/search/test/browser_405664.js
browser/components/search/test/browser_searchbar_openpopup.js
browser/components/uitour/UITour.jsm
browser/components/uitour/test/browser_UITour.js
browser/themes/linux/jar.mn
browser/themes/linux/searchbar.css
browser/themes/osx/Search.png
browser/themes/osx/Search@2x.png
browser/themes/osx/devedition.css
browser/themes/osx/jar.mn
browser/themes/osx/searchbar.css
browser/themes/shared/devedition.inc.css
browser/themes/shared/devedition/search.svg
browser/themes/windows/jar.mn
browser/themes/windows/searchbar.css
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -58,20 +58,16 @@
                      onclick="handleSearchCommand(event);"
                      tooltiptext="&searchEndCap.label;"/>
         </xul:hbox>
       </xul:textbox>
     </content>
 
     <implementation implements="nsIObserver">
       <constructor><![CDATA[
-        if (!this.hasAttribute("oneoffui")) {
-          this.setAttribute("oneoffui", "true");
-        }
-
         if (this.parentNode.parentNode.localName == "toolbarpaletteitem")
           return;
         // Make sure we rebuild the popup in onpopupshowing
         this._needToBuildPopup = true;
 
         var os =
                Components.classes["@mozilla.org/observer-service;1"]
                          .getService(Components.interfaces.nsIObserverService);
@@ -345,18 +341,17 @@
 
           if (newIndex >= 0 && newIndex < this.engines.length) {
             this.currentEngine = this.engines[newIndex];
           }
 
           aEvent.preventDefault();
           aEvent.stopPropagation();
 
-          if (this.hasAttribute("oneoffui"))
-            this.openSuggestionsPanel();
+          this.openSuggestionsPanel();
         ]]></body>
       </method>
 
       <method name="handleSearchCommand">
         <parameter name="aEvent"/>
         <parameter name="aEngine"/>
         <body><![CDATA[
           var textBox = this._textbox;
--- a/browser/components/search/test/browser.ini
+++ b/browser/components/search/test/browser.ini
@@ -9,17 +9,16 @@ support-files =
   test.html
   testEngine.src
   testEngine.xml
   testEngine_diacritics.xml
   testEngine_dupe.xml
   testEngine_mozsearch.xml
   webapi.html
 
-[browser_405664.js]
 [browser_426329.js]
 skip-if = e10s # Bug ?????? - Test uses load event and checks event.target.
 [browser_483086.js]
 [browser_addEngine.js]
 [browser_amazon.js]
 [browser_amazon_behavior.js]
 skip-if = e10s # Bug ?????? - some issue with progress listeners [JavaScript Error: "req.originalURI is null" {file: "chrome://mochitests/content/browser/browser/components/search/test/browser_bing_behavior.js" line: 127}]
 [browser_bing.js]
deleted file mode 100644
--- a/browser/components/search/test/browser_405664.js
+++ /dev/null
@@ -1,32 +0,0 @@
-function test() {
-  var searchBar = BrowserSearch.searchBar;
-  ok(searchBar, "got search bar");
-
-  if (searchBar.getAttribute("oneoffui"))
-    return; // The oneoffui removes the menu that's being tested here.
-
-  searchBar.focus();
-
-  var pbo = searchBar._popup.popupBoxObject;
-  ok(pbo, "popup is PopupBoxObject");
-
-  EventUtils.synthesizeKey("VK_UP", { altKey: true });
-  is(pbo.popupState, "showing", "popup is opening after Alt+Up");
-
-  EventUtils.synthesizeKey("VK_ESCAPE", {});
-  is(pbo.popupState, "closed", "popup is closed after ESC");
-
-  EventUtils.synthesizeKey("VK_DOWN", { altKey: true });
-  is(pbo.popupState, "showing", "popup is opening after Alt+Down");
-
-  EventUtils.synthesizeKey("VK_ESCAPE", {});
-  is(pbo.popupState, "closed", "popup is closed after ESC 2");
-
-  if (!/Mac/.test(navigator.platform)) {
-    EventUtils.synthesizeKey("VK_F4", {});
-    is(pbo.popupState, "showing", "popup is opening after F4");
-
-    EventUtils.synthesizeKey("VK_ESCAPE", {});
-    is(pbo.popupState, "closed", "popup is closed after ESC 3");
-  }
-}
--- a/browser/components/search/test/browser_searchbar_openpopup.js
+++ b/browser/components/search/test/browser_searchbar_openpopup.js
@@ -406,17 +406,17 @@ add_task(function* refocus_window_doesnt
 });
 
 // Clicking the search go button shouldn't open the popup
 add_no_popup_task(function* search_go_doesnt_open_popup() {
   gBrowser.selectedTab = gBrowser.addTab();
 
   gURLBar.focus();
   textbox.value = "foo";
-  searchbar.inputChanged();
+  searchbar.updateGoButtonVisibility();
 
   let promise = promiseOnLoad();
   EventUtils.synthesizeMouseAtCenter(goButton, {});
   yield promise;
 
   textbox.value = "";
   gBrowser.removeCurrentTab();
 });
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -224,37 +224,32 @@ this.UITour = {
       query: (aDocument) => {
         return null;
       },
       widgetName: "search-container",
     }],
     ["searchIcon", {
       query: (aDocument) => {
         let searchbar = aDocument.getElementById("searchbar");
-        if (!searchbar.hasAttribute("oneoffui")) {
-          return null;
-        }
         return aDocument.getAnonymousElementByAttribute(searchbar,
                                                         "anonid",
                                                         "searchbar-search-button");
       },
       widgetName: "search-container",
     }],
     ["searchPrefsLink", {
       query: (aDocument) => {
         let element = null;
         let searchbar = aDocument.getElementById("searchbar");
-        if (searchbar.hasAttribute("oneoffui")) {
-          let popup = aDocument.getElementById("PopupSearchAutoComplete");
-          if (popup.state != "open")
-            return null;
-          element = aDocument.getAnonymousElementByAttribute(popup,
-                                                             "anonid",
-                                                             "search-settings");
-        }
+        let popup = aDocument.getElementById("PopupSearchAutoComplete");
+        if (popup.state != "open")
+          return null;
+        element = aDocument.getAnonymousElementByAttribute(popup,
+                                                           "anonid",
+                                                           "search-settings");
         if (!element || !UITour.isElementVisible(element)) {
           return null;
         }
         return element;
       },
     }],
     ["selectedTabIcon", {
       query: (aDocument) => {
--- a/browser/components/uitour/test/browser_UITour.js
+++ b/browser/components/uitour/test/browser_UITour.js
@@ -217,20 +217,18 @@ let tests = [
     waitForElementToBeVisible(highlight, checkDefaultEffect, "Highlight should be shown after showHighlight()");
   },
   function test_highlight_search_engine(done) {
     let highlight = document.getElementById("UITourHighlight");
     gContentAPI.showHighlight("urlbar");
     waitForElementToBeVisible(highlight, () => {
 
       let searchbar = document.getElementById("searchbar");
-      if (searchbar.getAttribute("oneoffui")) {
-        done();
-        return; // The oneoffui removes the menu that's being tested here.
-      }
+      done();
+      return; // The oneoffui removes the menu that's being tested here.
 
       gContentAPI.showMenu("searchEngines", function() {
         isnot(searchbar, null, "Should have found searchbar");
         let searchPopup = document.getAnonymousElementByAttribute(searchbar,
                                                                    "anonid",
                                                                    "searchbar-popup");
         isnot(searchPopup, null, "Should have found search popup");
 
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -276,17 +276,16 @@ browser.jar:
   skin/classic/browser/tabview/search.png             (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png     (tabview/stack-expander.png)
   skin/classic/browser/tabview/tabview.png            (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css            (tabview/tabview.css)
   skin/classic/browser/translating-16.png             (../shared/translation/translating-16.png)
   skin/classic/browser/translating-16@2x.png          (../shared/translation/translating-16@2x.png)
   skin/classic/browser/translation-16.png             (../shared/translation/translation-16.png)
   skin/classic/browser/translation-16@2x.png          (../shared/translation/translation-16@2x.png)
-  skin/classic/browser/devedition/search.svg          (../shared/devedition/search.svg)
   skin/classic/browser/devedition/urlbar-history-dropmarker.svg            (../shared/devedition/urlbar-history-dropmarker.svg)
   skin/classic/browser/devedition/urlbar-arrow.png    (../shared/devedition/urlbar-arrow.png)
   skin/classic/browser/devedition/urlbar-arrow@2x.png (../shared/devedition/urlbar-arrow@2x.png)
 * skin/classic/browser/devtools/common.css            (../shared/devtools/common.css)
 * skin/classic/browser/devtools/dark-theme.css        (../shared/devtools/dark-theme.css)
 * skin/classic/browser/devtools/light-theme.css       (../shared/devtools/light-theme.css)
   skin/classic/browser/devtools/add.svg               (../shared/devtools/images/add.svg)
   skin/classic/browser/devtools/filters.svg           (../shared/devtools/filters.svg)
--- a/browser/themes/linux/searchbar.css
+++ b/browser/themes/linux/searchbar.css
@@ -25,17 +25,30 @@
 
 /* Search go button */
 .search-go-container {
   -moz-box-align: center;
 }
 
 .search-go-button {
   padding: 1px;
-  list-style-image: url(moz-icon://stock/gtk-find?size=menu);
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+.search-go-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+.search-go-button:hover:active {
+  -moz-image-region: rect(28px, 42px, 42px, 28px);
+}
+
+.search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
 menuitem[cmd="cmd_clearhistory"] {
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu");
 }
 
 menuitem[cmd="cmd_clearhistory"][disabled] {
   list-style-image: url("moz-icon://stock/gtk-clear?size=menu&state=disabled");
@@ -63,33 +76,16 @@ menuitem[cmd="cmd_clearhistory"][disable
 .searchbar-search-button:hover {
   -moz-image-region: rect(0, 40px, 20px, 20px);
 }
 
 .searchbar-search-button:hover:active {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
-searchbar[oneoffui] .search-go-button {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  -moz-image-region: rect(0, 42px, 14px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:hover {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:hover:active {
-  -moz-image-region: rect(28px, 42px, 42px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
 
 .search-panel-current-engine {
   border-top: none !important;
   -moz-box-align: center;
 }
 
 .search-panel-current-engine {
   border-bottom: 1px solid #ccc;
deleted file mode 100644
index 12df282d9d7f0ba06d5287026dbf0891e1802369..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a12c4133f83c46a2ac4ed3ffd516d69413a64958..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/devedition.css
+++ b/browser/themes/osx/devedition.css
@@ -1,22 +1,14 @@
 % This Source Code Form is subject to the terms of the Mozilla Public
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 %include ../shared/devedition.inc.css
 
-/* Use forward-facing magnifying glasses for the search box */
-:root[devtoolstheme="dark"] {
-  --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon-mac-inverted");
-}
-:root[devtoolstheme="light"] {
-  --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon-mac");
-}
-
 /* Use only 1px separator between nav toolbox and page content */
 #navigator-toolbox::after {
   background: linear-gradient(to top, var(--chrome-navigator-toolbox-separator-color), var(--chrome-navigator-toolbox-separator-color) 1px, transparent 1px);
 }
 
 /* Include extra space on left/right for dragging since there is no space above
    the tabs */
 #main-window[tabsintitlebar] #TabsToolbar {
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -96,18 +96,16 @@ browser.jar:
   skin/classic/browser/Privacy-16.png
   skin/classic/browser/privatebrowsing-mask.png
   skin/classic/browser/privatebrowsing-mask@2x.png
   skin/classic/browser/privatebrowsing-mask-short.png
   skin/classic/browser/privatebrowsing-mask-short@2x.png
   skin/classic/browser/reload-stop-go.png
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
-  skin/classic/browser/Search.png
-  skin/classic/browser/Search@2x.png
   skin/classic/browser/search-pref.png                         (../shared/search/search-pref.png)
   skin/classic/browser/search-indicator.png                    (../shared/search/search-indicator.png)
   skin/classic/browser/search-indicator@2x.png                 (../shared/search/search-indicator@2x.png)
   skin/classic/browser/search-engine-placeholder.png           (../shared/search/search-engine-placeholder.png)
   skin/classic/browser/search-engine-placeholder@2x.png        (../shared/search/search-engine-placeholder@2x.png)
   skin/classic/browser/badge-add-engine.png                    (../shared/search/badge-add-engine.png)
   skin/classic/browser/badge-add-engine@2x.png                 (../shared/search/badge-add-engine@2x.png)
   skin/classic/browser/search-indicator-badge-add.png          (../shared/search/search-indicator-badge-add.png)
@@ -373,17 +371,16 @@ browser.jar:
   skin/classic/browser/tabview/search.png                   (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png           (tabview/stack-expander.png)
   skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
   skin/classic/browser/translating-16.png                   (../shared/translation/translating-16.png)
   skin/classic/browser/translating-16@2x.png                (../shared/translation/translating-16@2x.png)
   skin/classic/browser/translation-16.png                   (../shared/translation/translation-16.png)
   skin/classic/browser/translation-16@2x.png                (../shared/translation/translation-16@2x.png)
-  skin/classic/browser/devedition/search.svg                (../shared/devedition/search.svg)
   skin/classic/browser/devedition/urlbar-history-dropmarker.svg            (../shared/devedition/urlbar-history-dropmarker.svg)
   skin/classic/browser/devedition/urlbar-arrow.png          (../shared/devedition/urlbar-arrow.png)
   skin/classic/browser/devedition/urlbar-arrow@2x.png       (../shared/devedition/urlbar-arrow@2x.png)
 * skin/classic/browser/devtools/common.css                  (../shared/devtools/common.css)
 * skin/classic/browser/devtools/dark-theme.css              (../shared/devtools/dark-theme.css)
 * skin/classic/browser/devtools/light-theme.css             (../shared/devtools/light-theme.css)
   skin/classic/browser/devtools/add.svg                     (../shared/devtools/images/add.svg)
   skin/classic/browser/devtools/filters.svg                 (../shared/devtools/filters.svg)
--- a/browser/themes/osx/searchbar.css
+++ b/browser/themes/osx/searchbar.css
@@ -32,17 +32,26 @@
   -moz-padding-end: 6px;
 }
 
 .searchbar-search-button-container {
   -moz-box-align: center;
 }
 
 .search-go-button {
-  list-style-image: url("chrome://browser/skin/Search.png");
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+.search-go-button:hover:active {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+.search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  transform: scaleX(-1);
 }
 
 .searchbar-search-button {
   list-style-image: url("chrome://browser/skin/search-indicator.png");
   -moz-image-region: rect(0, 20px, 20px, 0);
   -moz-margin-start: 3px;
   -moz-margin-end: 1px;
 }
@@ -54,36 +63,30 @@
 .searchbar-search-button:hover {
   -moz-image-region: rect(0, 40px, 20px, 20px);
 }
 
 .searchbar-search-button:hover:active {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
-searchbar[oneoffui] .search-go-button {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  -moz-image-region: rect(0, 42px, 14px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:hover:active {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
 @media (min-resolution: 2dppx) {
   .searchbar-engine-image {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
   }
 
   .search-go-button {
-    list-style-image: url("chrome://browser/skin/Search@2x.png");
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+    width: 14px;
+  }
+
+  .search-go-button:hover:active {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
     width: 14px;
   }
 
   .searchbar-search-button {
     list-style-image: url("chrome://browser/skin/search-indicator@2x.png");
     width: 20px;
     -moz-image-region: rect(0, 40px, 40px, 0);
   }
@@ -94,28 +97,16 @@ searchbar[oneoffui] .search-go-button:-m
 
   .searchbar-search-button:hover {
     -moz-image-region: rect(0, 80px, 40px, 40px);
   }
 
   .searchbar-search-button:hover:active {
     -moz-image-region: rect(0, 120px, 40px, 80px);
   }
-
-  searchbar[oneoffui] .search-go-button {
-    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
-    -moz-image-region: rect(0, 84px, 28px, 56px);
-    width: 14px;
-  }
-
-  searchbar[oneoffui] .search-go-button:hover:active {
-    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
-    -moz-image-region: rect(28px, 84px, 56px, 56px);
-    width: 14px;
-  }
 }
 
 .search-panel-current-engine {
   border-top: none !important;
   border-radius: 4px 4px 0 0;
 }
 
 .search-panel-current-engine {
--- a/browser/themes/shared/devedition.inc.css
+++ b/browser/themes/shared/devedition.inc.css
@@ -54,17 +54,16 @@
   --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg");
   --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px);
   --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px);
   --urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px);
   --urlbar-dropmarker-2x-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg");
   --urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px);
   --urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px);
   --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px);
-  --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon-inverted");
 }
 
 :root[devtoolstheme="dark"] #identity-box {
   --identity-box-chrome-color: #46afe3;
   --identity-box-verified-background-color: transparent;
   --identity-box-selected-background-color: rgba(231,230,230,.2);
 }
 
@@ -95,19 +94,16 @@
   /* Toolbar buttons */
   --toolbarbutton-hover-background: #eaeaea;
   --toolbarbutton-hover-boxshadow: none;
   --toolbarbutton-hover-bordercolor: rgba(0,0,0,0.1);
   --toolbarbutton-active-background: #d7d7d8 border-box;
   --toolbarbutton-active-boxshadow: none;
   --toolbarbutton-active-bordercolor: rgba(0,0,0,0.15);
   --toolbarbutton-checkedhover-backgroundcolor: #d7d7d8;
-
-  /* Url and search bars */
-  --search-button-image: url("chrome://browser/skin/devedition/search.svg#search-icon");
 }
 
 /* Give some space to drag the window around while customizing
    (normal space to left and right of tabs doesn't work in this case) */
 #main-window[tabsintitlebar][customizing] {
   --space-above-tabbar: 9px;
 }
 
@@ -259,22 +255,16 @@ window:not([chromehidden~="toolbar"]) #u
   padding-bottom: 0;
 }
 
 /* Use smaller back button icon */
 #back-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-searchbar:not([oneoffui]) .search-go-button {
-   /* !important is needed because searchbar.css is loaded after this */
-  -moz-image-region: auto !important;
-  list-style-image: var(--search-button-image);
-}
-
 .tab-background {
   visibility: hidden;
 }
 
 /* Tab separators */
 .tabbrowser-tab::after,
 .tabbrowser-tab::before {
   background: currentColor;
deleted file mode 100644
--- a/browser/themes/shared/devedition/search.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" width="16" height="16">
-  <style>
-    use:not(:target) {
-      display: none;
-    }
-    use {
-      fill: #797c80;
-    }
-    use[id*="-inverted"] {
-      fill: #b6babf;
-    }
-    use[id*="-mac"] {
-      transform: translate(16px) scaleX(-1);
-    }
-  </style>
-  <defs>
-    <path id="search" fill-rule="evenodd" d="M9.356,1.178c-3.014,0-5.458,2.45-5.458,5.472c0,1.086,0.32,2.096,0.864,2.947 l-3.279,3.287c-0.396,0.397-0.396,1.041,0,1.438l0.202,0.202c0.396,0.397,1.039,0.397,1.435,0l3.275-3.283 c0.854,0.554,1.869,0.88,2.962,0.88c3.014,0,5.458-2.45,5.458-5.471C14.814,3.627,12.371,1.178,9.356,1.178z M9.356,10.001 c-1.847,0-3.344-1.501-3.344-3.352c0-1.851,1.497-3.352,3.344-3.352c1.846,0,3.344,1.501,3.344,3.352 C12.7,8.501,11.203,10.001,9.356,10.001z"/>
-  </defs>
-  <use id="search-icon" xlink:href="#search"/>
-  <use id="search-icon-inverted" xlink:href="#search"/>
-  <use id="search-icon-mac" xlink:href="#search"/>
-  <use id="search-icon-mac-inverted" xlink:href="#search"/>
-</svg>
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -396,17 +396,16 @@ browser.jar:
         skin/classic/browser/tabview/stack-expander.png             (tabview/stack-expander.png)
         skin/classic/browser/tabview/tabview.png                    (tabview/tabview.png)
         skin/classic/browser/tabview/tabview-inverted.png           (tabview/tabview-inverted.png)
         skin/classic/browser/tabview/tabview.css                    (tabview/tabview.css)
         skin/classic/browser/translating-16.png                     (../shared/translation/translating-16.png)
         skin/classic/browser/translating-16@2x.png                  (../shared/translation/translating-16@2x.png)
         skin/classic/browser/translation-16.png                     (../shared/translation/translation-16.png)
         skin/classic/browser/translation-16@2x.png                  (../shared/translation/translation-16@2x.png)
-        skin/classic/browser/devedition/search.svg                  (../shared/devedition/search.svg)
         skin/classic/browser/devedition/urlbar-history-dropmarker.svg            (../shared/devedition/urlbar-history-dropmarker.svg)
         skin/classic/browser/devedition/urlbar-arrow.png            (../shared/devedition/urlbar-arrow.png)
         skin/classic/browser/devedition/urlbar-arrow@2x.png         (../shared/devedition/urlbar-arrow@2x.png)
 *       skin/classic/browser/devtools/common.css                    (../shared/devtools/common.css)
 *       skin/classic/browser/devtools/dark-theme.css                (../shared/devtools/dark-theme.css)
 *       skin/classic/browser/devtools/light-theme.css               (../shared/devtools/light-theme.css)
         skin/classic/browser/devtools/add.svg                       (../shared/devtools/images/add.svg)
         skin/classic/browser/devtools/filters.svg                   (../shared/devtools/filters.svg)
--- a/browser/themes/windows/searchbar.css
+++ b/browser/themes/windows/searchbar.css
@@ -27,30 +27,32 @@
 /* ::::: search-go-button ::::: */
 
 .search-go-container {
   -moz-box-align: center;
 }
 
 .search-go-button {
   padding: 1px;
-  list-style-image: url("chrome://global/skin/icons/Search-glass.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+  width: 14px;
 }
 
-.search-go-button:-moz-locale-dir(rtl) {
+.search-go-button:-moz-locale-dir(rtl),
+.search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   transform: scaleX(-1);
 }
 
 .search-go-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 .search-go-button:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  -moz-image-region: rect(28px, 42px, 42px, 28px);
 }
 
 
 .searchbar-search-button-container {
   -moz-box-align: center;
 }
 
 .searchbar-search-button {
@@ -69,34 +71,16 @@
 .searchbar-search-button:hover {
   -moz-image-region: rect(0, 40px, 20px, 20px);
 }
 
 .searchbar-search-button:hover:active {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
-searchbar[oneoffui] .search-go-button {
-  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  -moz-image-region: rect(0, 42px, 14px, 28px);
-  width: 14px;
-}
-
-searchbar[oneoffui] .search-go-button:hover {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:hover:active {
-  -moz-image-region: rect(28px, 42px, 42px, 28px);
-}
-
-searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
 @media (min-resolution: 1.1dppx) {
   .searchbar-engine-image {
     list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
   }
 
   .searchbar-search-button {
     list-style-image: url("chrome://browser/skin/search-indicator@2x.png");
     -moz-image-region: rect(0, 40px, 40px, 0);
@@ -109,26 +93,26 @@ searchbar[oneoffui] .search-go-button:-m
   .searchbar-search-button:hover {
     -moz-image-region: rect(0, 80px, 40px, 40px);
   }
 
   .searchbar-search-button:hover:active {
     -moz-image-region: rect(0, 120px, 40px, 80px);
   }
 
-  searchbar[oneoffui] .search-go-button {
+  .search-go-button {
     list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
     -moz-image-region: rect(0, 84px, 28px, 56px);
   }
 
-  searchbar[oneoffui] .search-go-button:hover {
+  .search-go-button:hover {
     -moz-image-region: rect(28px, 84px, 56px, 56px);
   }
 
-  searchbar[oneoffui] .search-go-button:hover:active {
+  .search-go-button:hover:active {
     -moz-image-region: rect(56px, 84px, 84px, 56px);
   }
 }
 
 .search-panel-current-engine {
   border-top: none !important;
   -moz-box-align: center;
 }