Bug 481382 - URL bar and searchbar don't honor graphite system appearance setting. r=gavin, ui-r=faaborg

browser/themes/pinstripe/browser/browser.css

@@ -810,6 +810,10 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   background: url("chrome://browser/skin/urlbar/endcap-focused.png") transparent right center no-repeat;
 }
 
+#urlbar[focused="true"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
+}
+
 #urlbar .textbox-input-box,
 #urlbar-icons {
   margin: 0;
@@ -821,6 +825,11 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
 }
 
+#urlbar[focused="true"] .textbox-input-box:-moz-system-metric(mac-graphite-theme),
+#urlbar[focused="true"] #urlbar-icons:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused-graphite.png");
+}
+
 #urlbar .textbox-input-box {
   padding-top: 1px;
 }
@@ -1868,6 +1877,10 @@ tabpanels.plain {
   background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
 }
 
+#urlbar[focused="true"] > #identity-box:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
+}
+
 #identity-box:focus > hbox > #page-proxy-deck {
   outline: 2px solid #4F8EC9;
   -moz-outline-radius: 2px;
@@ -1938,6 +1951,18 @@ tabpanels.plain {
   background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused.png");
 }
 
+#urlbar[focused="true"] > #identity-box.verifiedDomain:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox > #identity-icon-label:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused-graphite.png");
+}
+
 #identity-box.verifiedDomain > hbox > #identity-icon-label[value=""] {
   -moz-padding-start: 3px !important;
   -moz-padding-end: 8px !important;
@@ -1990,6 +2015,18 @@ tabpanels.plain {
   background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused.png");
 }
 
+#urlbar[focused="true"] > #identity-box.verifiedIdentity:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused-graphite.png");
+}
+
+#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox > #identity-icon-label:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused-graphite.png");
+}
+
 /* Favicon Glow */
 #identity-box.verifiedIdentity > hbox > #page-proxy-stack,
 #identity-box.verifiedDomain > hbox > #page-proxy-stack {

browser/themes/pinstripe/browser/jar.mn

@@ -132,10 +132,14 @@ classic.jar:
   skin/classic/browser/urlbar/endcap.png                                 (urlbar/endcap.png)
   skin/classic/browser/urlbar/endcap-rtl.png                             (urlbar/endcap-rtl.png)
   skin/classic/browser/urlbar/endcap-focused.png                         (urlbar/endcap-focused.png)
+  skin/classic/browser/urlbar/endcap-focused-graphite.png                (urlbar/endcap-focused-graphite.png)
+  skin/classic/browser/urlbar/endcap-focused-graphite-rtl.png            (urlbar/endcap-focused-graphite-rtl.png)
   skin/classic/browser/urlbar/endcap-focused-rtl.png                     (urlbar/endcap-focused-rtl.png)
   skin/classic/browser/urlbar/startcap.png                               (urlbar/startcap.png)
   skin/classic/browser/urlbar/startcap-rtl.png                           (urlbar/startcap-rtl.png)
   skin/classic/browser/urlbar/startcap-focused.png                       (urlbar/startcap-focused.png)
+  skin/classic/browser/urlbar/startcap-focused-graphite.png              (urlbar/startcap-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-focused-graphite-rtl.png          (urlbar/startcap-focused-graphite-rtl.png)
   skin/classic/browser/urlbar/startcap-focused-rtl.png                   (urlbar/startcap-focused-rtl.png)
   skin/classic/browser/urlbar/startcap-secure-start.png                  (urlbar/startcap-secure-start.png)
   skin/classic/browser/urlbar/startcap-secure-mid.png                    (urlbar/startcap-secure-mid.png)
@@ -144,8 +148,11 @@ classic.jar:
   skin/classic/browser/urlbar/startcap-secure-mid-active.png             (urlbar/startcap-secure-mid-active.png)
   skin/classic/browser/urlbar/startcap-secure-end-active.png             (urlbar/startcap-secure-end-active.png)
   skin/classic/browser/urlbar/startcap-secure-start-focused.png          (urlbar/startcap-secure-start-focused.png)
+  skin/classic/browser/urlbar/startcap-secure-start-focused-graphite.png (urlbar/startcap-secure-start-focused-graphite.png)
   skin/classic/browser/urlbar/startcap-secure-mid-focused.png            (urlbar/startcap-secure-mid-focused.png)
+  skin/classic/browser/urlbar/startcap-secure-mid-focused-graphite.png   (urlbar/startcap-secure-mid-focused-graphite.png)
   skin/classic/browser/urlbar/startcap-secure-end-focused.png            (urlbar/startcap-secure-end-focused.png)
+  skin/classic/browser/urlbar/startcap-secure-end-focused-graphite.png   (urlbar/startcap-secure-end-focused-graphite.png)
   skin/classic/browser/urlbar/startcap-verified-start.png                (urlbar/startcap-verified-start.png)
   skin/classic/browser/urlbar/startcap-verified-mid.png                  (urlbar/startcap-verified-mid.png)
   skin/classic/browser/urlbar/startcap-verified-end.png                  (urlbar/startcap-verified-end.png)
@@ -153,16 +160,22 @@ classic.jar:
   skin/classic/browser/urlbar/startcap-verified-mid-active.png           (urlbar/startcap-verified-mid-active.png)
   skin/classic/browser/urlbar/startcap-verified-end-active.png           (urlbar/startcap-verified-end-active.png)
   skin/classic/browser/urlbar/startcap-verified-start-focused.png        (urlbar/startcap-verified-start-focused.png)
+  skin/classic/browser/urlbar/startcap-verified-start-focused-graphite.png (urlbar/startcap-verified-start-focused-graphite.png)
   skin/classic/browser/urlbar/startcap-verified-mid-focused.png          (urlbar/startcap-verified-mid-focused.png)
+  skin/classic/browser/urlbar/startcap-verified-mid-focused-graphite.png (urlbar/startcap-verified-mid-focused-graphite.png)
   skin/classic/browser/urlbar/startcap-verified-end-focused.png          (urlbar/startcap-verified-end-focused.png)
+  skin/classic/browser/urlbar/startcap-verified-end-focused-graphite.png (urlbar/startcap-verified-end-focused-graphite.png)
   skin/classic/browser/urlbar/startcap-secure.png                        (urlbar/startcap-secure.png)
   skin/classic/browser/urlbar/startcap-active.png                        (urlbar/startcap-active.png)
   skin/classic/browser/urlbar/startcap-active-rtl.png                    (urlbar/startcap-active-rtl.png)
   skin/classic/browser/urlbar/startcap-active-focused.png                (urlbar/startcap-active-focused.png)
+  skin/classic/browser/urlbar/startcap-active-focused-graphite.png       (urlbar/startcap-active-focused-graphite.png)
+  skin/classic/browser/urlbar/startcap-active-focused-graphite-rtl.png   (urlbar/startcap-active-focused-graphite-rtl.png)
   skin/classic/browser/urlbar/startcap-active-focused-rtl.png            (urlbar/startcap-active-focused-rtl.png)
   skin/classic/browser/urlbar/startcap-secure-active.png                 (urlbar/startcap-secure-active.png)
   skin/classic/browser/urlbar/urlbar-favicon-glow.png                    (urlbar/urlbar-favicon-glow.png)
   skin/classic/browser/urlbar/textfield-mid.png                          (urlbar/textfield-mid.png)
   skin/classic/browser/urlbar/textfield-mid-focused.png                  (urlbar/textfield-mid-focused.png)
+  skin/classic/browser/urlbar/textfield-mid-focused-graphite.png         (urlbar/textfield-mid-focused-graphite.png)
   icon.png
   preview.png

browser/themes/pinstripe/browser/searchbar.css

@@ -22,6 +22,10 @@
   background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png");
 }
 
+.searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused-graphite.png");
+}
+
 .searchbar-engine-image {
   width: 16px;
   height: 16px;
@@ -53,6 +57,14 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png");
 }
 
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
+}
+
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite-rtl.png");
+}
+
 .searchbar-engine-button:hover:active,
 .searchbar-engine-button[open="true"] {
   background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
@@ -73,6 +85,16 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important;
 }
 
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:active:-moz-system-metric(mac-graphite-theme),
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite.png") !important;
+}
+
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active:-moz-system-metric(mac-graphite-theme),
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite-rtl.png") !important;
+}
+
 .searchbar-engine-button > .button-box {
   -moz-appearance: none;
   padding: 0;
@@ -108,6 +130,14 @@
   background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top;
 }
 
+.searchbar-textbox[focused="true"] > .search-go-container:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
+}
+
+.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+  background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite-rtl.png");
+}
+
 #searchbar[empty="true"] .search-go-button {
   visibility: hidden;
 }