Bug 1000625 - Move generic in-content icons to in-content folder. r=Unfocused

--HG--
rename : browser/themes/shared/incontentprefs/check.png => browser/themes/shared/in-content/check.png
rename : browser/themes/shared/incontentprefs/check@2x.png => browser/themes/shared/in-content/check@2x.png
rename : browser/themes/shared/incontentprefs/dropdown-disabled.png => browser/themes/shared/in-content/dropdown-disabled.png
rename : browser/themes/shared/incontentprefs/dropdown-disabled@2x.png => browser/themes/shared/in-content/dropdown-disabled@2x.png
rename : browser/themes/shared/incontentprefs/dropdown.png => browser/themes/shared/in-content/dropdown.png
rename : browser/themes/shared/incontentprefs/dropdown@2x.png => browser/themes/shared/in-content/dropdown@2x.png
rename : browser/themes/shared/incontentprefs/help-glyph.png => browser/themes/shared/in-content/help-glyph.png
rename : browser/themes/shared/incontentprefs/help-glyph@2x.png => browser/themes/shared/in-content/help-glyph@2x.png
rename : browser/themes/shared/incontentprefs/sorter.png => browser/themes/shared/in-content/sorter.png
rename : browser/themes/shared/incontentprefs/sorter@2x.png => browser/themes/shared/in-content/sorter@2x.png
extra : rebase_source : 8f4e79dbb5b743397fe4c4d0aaf98cbf895659d8

browser/themes/linux/jar.mn

@@ -36,6 +36,16 @@ browser.jar:
   skin/classic/browser/identity-icons-https-mixed-display.png
   skin/classic/browser/Info.png
 * skin/classic/browser/in-content/common.css                    (in-content/common.css)
+  skin/classic/browser/in-content/check.png                 (../shared/in-content/check.png)
+  skin/classic/browser/in-content/check@2x.png              (../shared/in-content/check@2x.png)
+  skin/classic/browser/in-content/dropdown.png              (../shared/in-content/dropdown.png)
+  skin/classic/browser/in-content/dropdown@2x.png           (../shared/in-content/dropdown@2x.png)
+  skin/classic/browser/in-content/dropdown-disabled.png     (../shared/in-content/dropdown-disabled.png)
+  skin/classic/browser/in-content/dropdown-disabled@2x.png  (../shared/in-content/dropdown-disabled@2x.png)
+  skin/classic/browser/in-content/help-glyph.png            (../shared/in-content/help-glyph.png)
+  skin/classic/browser/in-content/help-glyph@2x.png         (../shared/in-content/help-glyph@2x.png)
+  skin/classic/browser/in-content/sorter.png                (../shared/in-content/sorter.png)
+  skin/classic/browser/in-content/sorter@2x.png             (../shared/in-content/sorter@2x.png)
   skin/classic/browser/menuPanel.png
   skin/classic/browser/menuPanel-customize.png
   skin/classic/browser/menuPanel-exit.png
@@ -150,18 +160,8 @@ browser.jar:
 * skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
 * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
   skin/classic/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
-  skin/classic/browser/preferences/in-content/check.png       (../shared/incontentprefs/check.png)
-  skin/classic/browser/preferences/in-content/check@2x.png    (../shared/incontentprefs/check@2x.png)
   skin/classic/browser/preferences/in-content/icons.png       (../shared/incontentprefs/icons.png)
   skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
-  skin/classic/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
-  skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
-  skin/classic/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
-  skin/classic/browser/preferences/in-content/dropdown@2x.png (../shared/incontentprefs/dropdown@2x.png)
-  skin/classic/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
-  skin/classic/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
-  skin/classic/browser/preferences/in-content/dropdown-disabled.png    (../shared/incontentprefs/dropdown-disabled.png)
-  skin/classic/browser/preferences/in-content/dropdown-disabled@2x.png (../shared/incontentprefs/dropdown-disabled@2x.png)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
   skin/classic/browser/social/services-16.png         (social/services-16.png)

browser/themes/osx/jar.mn

@@ -44,6 +44,16 @@ browser.jar:
   skin/classic/browser/identity-icons-https-mixed-display@2x.png
   skin/classic/browser/Info.png
 * skin/classic/browser/in-content/common.css                (in-content/common.css)
+  skin/classic/browser/in-content/check.png                 (../shared/in-content/check.png)
+  skin/classic/browser/in-content/check@2x.png              (../shared/in-content/check@2x.png)
+  skin/classic/browser/in-content/dropdown.png              (../shared/in-content/dropdown.png)
+  skin/classic/browser/in-content/dropdown@2x.png           (../shared/in-content/dropdown@2x.png)
+  skin/classic/browser/in-content/dropdown-disabled.png     (../shared/in-content/dropdown-disabled.png)
+  skin/classic/browser/in-content/dropdown-disabled@2x.png  (../shared/in-content/dropdown-disabled@2x.png)
+  skin/classic/browser/in-content/help-glyph.png            (../shared/in-content/help-glyph.png)
+  skin/classic/browser/in-content/help-glyph@2x.png         (../shared/in-content/help-glyph@2x.png)
+  skin/classic/browser/in-content/sorter.png                (../shared/in-content/sorter.png)
+  skin/classic/browser/in-content/sorter@2x.png             (../shared/in-content/sorter@2x.png)
   skin/classic/browser/keyhole-circle.png
   skin/classic/browser/keyhole-circle@2x.png
   skin/classic/browser/KUI-background.png
@@ -248,18 +258,8 @@ browser.jar:
 * skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
 * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
   skin/classic/browser/preferences/in-content/favicon.ico     (../shared/incontentprefs/favicon.ico)
-  skin/classic/browser/preferences/in-content/check.png       (../shared/incontentprefs/check.png)
-  skin/classic/browser/preferences/in-content/check@2x.png    (../shared/incontentprefs/check@2x.png)
   skin/classic/browser/preferences/in-content/icons.png       (../shared/incontentprefs/icons.png)
   skin/classic/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
-  skin/classic/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
-  skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
-  skin/classic/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
-  skin/classic/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
-  skin/classic/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
-  skin/classic/browser/preferences/in-content/dropdown@2x.png (../shared/incontentprefs/dropdown@2x.png)
-  skin/classic/browser/preferences/in-content/dropdown-disabled.png    (../shared/incontentprefs/dropdown-disabled.png)
-  skin/classic/browser/preferences/in-content/dropdown-disabled@2x.png (../shared/incontentprefs/dropdown-disabled@2x.png)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/preferences/aboutPermissions.css     (preferences/aboutPermissions.css)
   skin/classic/browser/social/services-16.png               (social/services-16.png)

browser/themes/shared/in-content/common.inc.css

@@ -219,7 +219,7 @@ button[type="menu"] > .button-box > .button-menu-dropmarker {
   height: 16px;
   border: none;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown.png");
+  list-style-image: url("chrome://browser/skin/in-content/dropdown.png");
 }
 
 .help-button {
@@ -252,14 +252,14 @@ button[type="menu"] > .button-box > .button-menu-dropmarker {
 .help-button > .button-box > .button-icon {
   width: 26px;
   height: 26px;
-  background-image: url("chrome://browser/skin/preferences/in-content/help-glyph.png");
+  background-image: url("chrome://browser/skin/in-content/help-glyph.png");
   background-position: center;
 }
 
 @media (min-resolution: 2dppx) {
   .help-button > .button-box > .button-icon {
     background-size: 26px 26px;
-    background-image: url("chrome://browser/skin/preferences/in-content/help-glyph@2x.png");
+    background-image: url("chrome://browser/skin/in-content/help-glyph@2x.png");
   }
 }
 
@@ -308,21 +308,21 @@ menulist:not([editable="true"]) > .menulist-dropmarker {
   padding: 0;
   border: none;
   background-color: transparent;
-  list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown.png")
+  list-style-image: url("chrome://browser/skin/in-content/dropdown.png");
 }
 
 menulist[disabled="true"]:not([editable="true"]) > .menulist-dropmarker {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown-disabled.png")
+  list-style-image: url("chrome://browser/skin/in-content/dropdown-disabled.png")
 }
 
 @media (min-resolution: 2dppx) {
   menulist:not([editable="true"]) > .menulist-dropmarker,
   button[type="menu"] > .button-box > .button-menu-dropmarker {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown@2x.png");
+    list-style-image: url("chrome://browser/skin/in-content/dropdown@2x.png");
   }
 
   menulist[disabled="true"]:not([editable="true"]) > .menulist-dropmarker {
-    list-style-image: url("chrome://browser/skin/preferences/in-content/dropdown-disabled@2x.png")
+    list-style-image: url("chrome://browser/skin/in-content/dropdown-disabled@2x.png")
   }
 
   menulist:not([editable="true"]) > .menulist-dropmarker > .dropmarker-icon,
@@ -454,7 +454,7 @@ checkbox:not([disabled="true"]):hover > .checkbox-check {
 }
 
 .checkbox-check[checked] {
-  background-image: url("chrome://browser/skin/preferences/in-content/check.png"),
+  background-image: url("chrome://browser/skin/in-content/check.png"),
                     /* !important needed to override toolkit !important rule */
                     linear-gradient(#ffffff, rgba(255,255,255,0.8)) !important;
 }
@@ -471,7 +471,7 @@ checkbox[disabled="true"] > .checkbox-check {
 @media (min-resolution: 2dppx) {
   .checkbox-check[checked] {
     background-size: 12px 12px, auto;
-    background-image: url("chrome://browser/skin/preferences/in-content/check@2x.png"),
+    background-image: url("chrome://browser/skin/in-content/check@2x.png"),
                       linear-gradient(#ffffff, rgba(255,255,255,0.8)) !important;
   }
 }

browser/themes/windows/jar.mn

@@ -38,6 +38,16 @@ browser.jar:
         skin/classic/browser/identity-icons-https-mixed-active.png
         skin/classic/browser/identity-icons-https-mixed-display.png
 *       skin/classic/browser/in-content/common.css                  (in-content/common.css)
+        skin/classic/browser/in-content/check.png                   (../shared/in-content/check.png)
+        skin/classic/browser/in-content/check@2x.png                (../shared/in-content/check@2x.png)
+        skin/classic/browser/in-content/dropdown.png                (../shared/in-content/dropdown.png)
+        skin/classic/browser/in-content/dropdown@2x.png             (../shared/in-content/dropdown@2x.png)
+        skin/classic/browser/in-content/dropdown-disabled.png       (../shared/in-content/dropdown-disabled.png)
+        skin/classic/browser/in-content/dropdown-disabled@2x.png    (../shared/in-content/dropdown-disabled@2x.png)
+        skin/classic/browser/in-content/help-glyph.png              (../shared/in-content/help-glyph.png)
+        skin/classic/browser/in-content/help-glyph@2x.png           (../shared/in-content/help-glyph@2x.png)
+        skin/classic/browser/in-content/sorter.png                  (../shared/in-content/sorter.png)
+        skin/classic/browser/in-content/sorter@2x.png               (../shared/in-content/sorter@2x.png)
         skin/classic/browser/keyhole-forward-mask.svg
         skin/classic/browser/KUI-background.png
         skin/classic/browser/livemark-folder.png
@@ -177,18 +187,8 @@ browser.jar:
 *       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
 *       skin/classic/browser/preferences/in-content/preferences.css  (preferences/in-content/preferences.css)
         skin/classic/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs/favicon.ico)
-        skin/classic/browser/preferences/in-content/check.png        (../shared/incontentprefs/check.png)
-        skin/classic/browser/preferences/in-content/check@2x.png     (../shared/incontentprefs/check@2x.png)
         skin/classic/browser/preferences/in-content/icons.png        (../shared/incontentprefs/icons.png)
         skin/classic/browser/preferences/in-content/icons@2x.png     (../shared/incontentprefs/icons@2x.png)
-        skin/classic/browser/preferences/in-content/help-glyph.png   (../shared/incontentprefs/help-glyph.png)
-        skin/classic/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
-        skin/classic/browser/preferences/in-content/sorter.png       (../shared/incontentprefs/sorter.png)
-        skin/classic/browser/preferences/in-content/sorter@2x.png    (../shared/incontentprefs/sorter@2x.png)
-        skin/classic/browser/preferences/in-content/dropdown.png     (../shared/incontentprefs/dropdown.png)
-        skin/classic/browser/preferences/in-content/dropdown@2x.png  (../shared/incontentprefs/dropdown@2x.png)
-        skin/classic/browser/preferences/in-content/dropdown-disabled.png     (../shared/incontentprefs/dropdown-disabled.png)
-        skin/classic/browser/preferences/in-content/dropdown-disabled@2x.png  (../shared/incontentprefs/dropdown-disabled@2x.png)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
         skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
         skin/classic/browser/social/services-16.png                  (social/services-16.png)
@@ -456,7 +456,17 @@ browser.jar:
         skin/classic/aero/browser/identity-icons-https-ev.png
         skin/classic/aero/browser/identity-icons-https-mixed-active.png
         skin/classic/aero/browser/identity-icons-https-mixed-display.png
-*       skin/classic/aero/browser/in-content/common.css              (in-content/common.css)
+*       skin/classic/aero/browser/in-content/common.css               (in-content/common.css)
+        skin/classic/aero/browser/in-content/check.png                (../shared/in-content/check.png)
+        skin/classic/aero/browser/in-content/check@2x.png             (../shared/in-content/check@2x.png)
+        skin/classic/aero/browser/in-content/dropdown.png             (../shared/in-content/dropdown.png)
+        skin/classic/aero/browser/in-content/dropdown@2x.png          (../shared/in-content/dropdown@2x.png)
+        skin/classic/aero/browser/in-content/dropdown-disabled.png    (../shared/in-content/dropdown-disabled.png)
+        skin/classic/aero/browser/in-content/dropdown-disabled@2x.png (../shared/in-content/dropdown-disabled@2x.png)
+        skin/classic/aero/browser/in-content/help-glyph.png           (../shared/in-content/help-glyph.png)
+        skin/classic/aero/browser/in-content/help-glyph@2x.png        (../shared/in-content/help-glyph@2x.png)
+        skin/classic/aero/browser/in-content/sorter.png               (../shared/in-content/sorter.png)
+        skin/classic/aero/browser/in-content/sorter@2x.png            (../shared/in-content/sorter@2x.png)
         skin/classic/aero/browser/keyhole-forward-mask.svg
         skin/classic/aero/browser/KUI-background.png
         skin/classic/aero/browser/livemark-folder.png                (livemark-folder-aero.png)
@@ -602,18 +612,8 @@ browser.jar:
 *       skin/classic/aero/browser/preferences/preferences.css        (preferences/preferences.css)
 *       skin/classic/aero/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
         skin/classic/aero/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs/favicon.ico)
-        skin/classic/aero/browser/preferences/in-content/check.png       (../shared/incontentprefs/check.png)
-        skin/classic/aero/browser/preferences/in-content/check@2x.png    (../shared/incontentprefs/check@2x.png)
         skin/classic/aero/browser/preferences/in-content/icons.png       (../shared/incontentprefs/icons.png)
         skin/classic/aero/browser/preferences/in-content/icons@2x.png    (../shared/incontentprefs/icons@2x.png)
-        skin/classic/aero/browser/preferences/in-content/help-glyph.png  (../shared/incontentprefs/help-glyph.png)
-        skin/classic/aero/browser/preferences/in-content/help-glyph@2x.png (../shared/incontentprefs/help-glyph@2x.png)
-        skin/classic/aero/browser/preferences/in-content/sorter.png      (../shared/incontentprefs/sorter.png)
-        skin/classic/aero/browser/preferences/in-content/sorter@2x.png   (../shared/incontentprefs/sorter@2x.png)
-        skin/classic/aero/browser/preferences/in-content/dropdown.png    (../shared/incontentprefs/dropdown.png)
-        skin/classic/aero/browser/preferences/in-content/dropdown@2x.png (../shared/incontentprefs/dropdown@2x.png)
-        skin/classic/aero/browser/preferences/in-content/dropdown-disabled.png    (../shared/incontentprefs/dropdown-disabled.png)
-        skin/classic/aero/browser/preferences/in-content/dropdown-disabled@2x.png (../shared/incontentprefs/dropdown-disabled@2x.png)
         skin/classic/aero/browser/preferences/applications.css       (preferences/applications.css)
         skin/classic/aero/browser/preferences/aboutPermissions.css   (preferences/aboutPermissions.css)
         skin/classic/aero/browser/social/services-16.png             (social/services-16.png)