Bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. r=jaws

Depends on D71019

Differential Revision: https://phabricator.services.mozilla.com/D71020

--HG--
rename : browser/themes/shared/incontentprefs/bookmark.svg => browser/themes/shared/preferences/bookmark.svg
rename : browser/themes/shared/incontentprefs/critters-postcard.jpg => browser/themes/shared/preferences/critters-postcard.jpg
rename : browser/themes/shared/incontentprefs/dialog.inc.css => browser/themes/shared/preferences/dialog.inc.css
rename : browser/themes/shared/incontentprefs/extensions.svg => browser/themes/shared/preferences/extensions.svg
rename : browser/themes/shared/incontentprefs/face-sad.svg => browser/themes/shared/preferences/face-sad.svg
rename : browser/themes/shared/incontentprefs/face-smile.svg => browser/themes/shared/preferences/face-smile.svg
rename : browser/themes/shared/incontentprefs/formfill.svg => browser/themes/shared/preferences/formfill.svg
rename : browser/themes/shared/incontentprefs/fxaPairDevice.css => browser/themes/shared/preferences/fxaPairDevice.css
rename : browser/themes/shared/incontentprefs/general.svg => browser/themes/shared/preferences/general.svg
rename : browser/themes/shared/incontentprefs/history.svg => browser/themes/shared/preferences/history.svg
rename : browser/themes/shared/incontentprefs/no-search-bar.svg => browser/themes/shared/preferences/no-search-bar.svg
rename : browser/themes/shared/incontentprefs/no-search-results.svg => browser/themes/shared/preferences/no-search-results.svg
rename : browser/themes/shared/incontentprefs/preferences.inc.css => browser/themes/shared/preferences/preferences.inc.css
rename : browser/themes/shared/incontentprefs/preferences.svg => browser/themes/shared/preferences/preferences.svg
rename : browser/themes/shared/incontentprefs/privacy-security.svg => browser/themes/shared/preferences/privacy-security.svg
rename : browser/themes/shared/incontentprefs/privacy.css => browser/themes/shared/preferences/privacy.css
rename : browser/themes/shared/incontentprefs/search-arrow-indicator.svg => browser/themes/shared/preferences/search-arrow-indicator.svg
rename : browser/themes/shared/incontentprefs/search-bar.svg => browser/themes/shared/preferences/search-bar.svg
rename : browser/themes/shared/incontentprefs/search.css => browser/themes/shared/preferences/search.css
rename : browser/themes/shared/incontentprefs/search.svg => browser/themes/shared/preferences/search.svg
rename : browser/themes/shared/incontentprefs/siteDataSettings.css => browser/themes/shared/preferences/siteDataSettings.css
rename : browser/themes/shared/incontentprefs/sync.svg => browser/themes/shared/preferences/sync.svg
rename : browser/themes/shared/incontentprefs/tab.svg => browser/themes/shared/preferences/tab.svg
extra : moz-landing-system : lando

browser/components/aboutconfig/content/aboutconfig.css

@@ -111,7 +111,7 @@
 
 #prefs > tr.locked {
   opacity: 0.4;
-  background-image: url("chrome://browser/skin/preferences/in-content/privacy-security.svg");
+  background-image: url("chrome://browser/skin/preferences/privacy-security.svg");
   background-repeat: no-repeat;
   background-position: 9px center;
   background-size: 16px 16px;

browser/components/preferences/in-content/fxaPairDevice.xhtml

@@ -6,7 +6,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/fxaPairDevice.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/fxaPairDevice.css" type="text/css"?>
 
 <window id="fxaPairDeviceDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

browser/components/preferences/in-content/preferences.xhtml

@@ -9,9 +9,9 @@
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/search.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?>
 
 <!DOCTYPE html>
 

browser/components/preferences/siteDataRemoveSelected.xhtml

@@ -6,7 +6,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
 
 <window windowtype="Browser:SiteDataRemoveSelected"
         width="500"

browser/components/preferences/siteDataSettings.xhtml

@@ -7,7 +7,7 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/preferences/siteDataSettings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/siteDataSettings.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
 
 <window id="SiteDataSettingsDialog" windowtype="Browser:SiteDataSettings"
         data-l10n-id="site-data-settings-window"

browser/themes/linux/preferences/dialog.css

@@ -2,7 +2,7 @@
    - 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/incontentprefs/dialog.inc.css
+%include ../../shared/preferences/dialog.inc.css
 
 :root > * {
   font-size: 1.05em;

browser/themes/linux/preferences/preferences.css

@@ -2,7 +2,7 @@
    - 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/incontentprefs/preferences.inc.css
+%include ../../shared/preferences/preferences.inc.css
 
 /* Global rules */
 body {

browser/themes/osx/preferences/dialog.css

@@ -2,7 +2,7 @@
    - 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/incontentprefs/dialog.inc.css
+%include ../../shared/preferences/dialog.inc.css
 
 window {
   font: message-box !important;

browser/themes/osx/preferences/preferences.css

@@ -2,7 +2,7 @@
    - 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/incontentprefs/preferences.inc.css
+%include ../../shared/preferences/preferences.inc.css
 
 body {
   font-size: 1.36em;

browser/themes/shared/incontentprefs/containers.css

@@ -1,30 +0,0 @@
-/* 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 ../../../components/contextualidentity/content/usercontext.css
-
-.container-header-links {
-  font-size: 1.25rem;
-  margin-block-end: 15px;
-}
-
-[data-identity-icon] {
-  margin: 0;
-  margin-inline-end: 16px;
-}
-
-#containersView {
-  border: 0 none;
-  background: transparent;
-}
-
-#containersView richlistitem {
-  padding-block: 4px;
-  border-block-end: 1px solid var(--in-content-box-border-color);
-}
-
-#containersView richlistitem:last-of-type {
-  border-block-end: 0 none;
-  margin-block-end: 8px;
-}

browser/themes/shared/jar.inc.mn

@@ -113,28 +113,28 @@
   skin/classic/browser/panel-icon-retry.svg                    (../shared/panel-icon-retry.svg)
   skin/classic/browser/toolbar-drag-indicator.svg              (../shared/toolbar-drag-indicator.svg)
 
-  skin/classic/browser/preferences/in-content/bookmark.svg     (../shared/incontentprefs/bookmark.svg)
-  skin/classic/browser/preferences/in-content/critters-postcard.jpg       (../shared/incontentprefs/critters-postcard.jpg)
-  skin/classic/browser/preferences/in-content/extensions.svg   (../shared/incontentprefs/extensions.svg)
-  skin/classic/browser/preferences/in-content/face-sad.svg      (../shared/incontentprefs/face-sad.svg)
-  skin/classic/browser/preferences/in-content/face-smile.svg    (../shared/incontentprefs/face-smile.svg)
-  skin/classic/browser/preferences/in-content/formfill.svg      (../shared/incontentprefs/formfill.svg)
-  skin/classic/browser/preferences/in-content/fxaPairDevice.css (../shared/incontentprefs/fxaPairDevice.css)
-  skin/classic/browser/preferences/in-content/general.svg       (../shared/incontentprefs/general.svg)
-  skin/classic/browser/preferences/in-content/history.svg       (../shared/incontentprefs/history.svg)
-  skin/classic/browser/preferences/in-content/no-search-bar.svg           (../shared/incontentprefs/no-search-bar.svg)
-  skin/classic/browser/preferences/in-content/no-search-results.svg       (../shared/incontentprefs/no-search-results.svg)
-  skin/classic/browser/preferences/in-content/preferences.svg   (../shared/incontentprefs/preferences.svg)
-  skin/classic/browser/preferences/in-content/privacy-security.svg        (../shared/incontentprefs/privacy-security.svg)
-  skin/classic/browser/preferences/in-content/privacy.css      (../shared/incontentprefs/privacy.css)
-  skin/classic/browser/preferences/in-content/search-arrow-indicator.svg  (../shared/incontentprefs/search-arrow-indicator.svg)
-  skin/classic/browser/preferences/in-content/search-bar.svg   (../shared/incontentprefs/search-bar.svg)
-  skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs/search.css)
-  skin/classic/browser/preferences/in-content/search.svg       (../shared/incontentprefs/search.svg)
-  skin/classic/browser/preferences/in-content/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
-  skin/classic/browser/preferences/in-content/sync.svg         (../shared/incontentprefs/sync.svg)
-  skin/classic/browser/preferences/in-content/tab.svg          (../shared/incontentprefs/tab.svg)
-* skin/classic/browser/preferences/in-content/containers.css   (../shared/incontentprefs/containers.css)
+  skin/classic/browser/preferences/bookmark.svg                (../shared/preferences/bookmark.svg)
+  skin/classic/browser/preferences/critters-postcard.jpg       (../shared/preferences/critters-postcard.jpg)
+  skin/classic/browser/preferences/extensions.svg              (../shared/preferences/extensions.svg)
+  skin/classic/browser/preferences/face-sad.svg                (../shared/preferences/face-sad.svg)
+  skin/classic/browser/preferences/face-smile.svg              (../shared/preferences/face-smile.svg)
+  skin/classic/browser/preferences/formfill.svg                (../shared/preferences/formfill.svg)
+  skin/classic/browser/preferences/fxaPairDevice.css           (../shared/preferences/fxaPairDevice.css)
+  skin/classic/browser/preferences/general.svg                 (../shared/preferences/general.svg)
+  skin/classic/browser/preferences/history.svg                 (../shared/preferences/history.svg)
+  skin/classic/browser/preferences/no-search-bar.svg           (../shared/preferences/no-search-bar.svg)
+  skin/classic/browser/preferences/no-search-results.svg       (../shared/preferences/no-search-results.svg)
+  skin/classic/browser/preferences/preferences.svg             (../shared/preferences/preferences.svg)
+  skin/classic/browser/preferences/privacy-security.svg        (../shared/preferences/privacy-security.svg)
+  skin/classic/browser/preferences/privacy.css                 (../shared/preferences/privacy.css)
+  skin/classic/browser/preferences/search-arrow-indicator.svg  (../shared/preferences/search-arrow-indicator.svg)
+  skin/classic/browser/preferences/search-bar.svg              (../shared/preferences/search-bar.svg)
+  skin/classic/browser/preferences/search.css                  (../shared/preferences/search.css)
+  skin/classic/browser/preferences/search.svg                  (../shared/preferences/search.svg)
+  skin/classic/browser/preferences/siteDataSettings.css        (../shared/preferences/siteDataSettings.css)
+  skin/classic/browser/preferences/sync.svg                    (../shared/preferences/sync.svg)
+  skin/classic/browser/preferences/tab.svg                     (../shared/preferences/tab.svg)
+* skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
 * skin/classic/browser/preferences/containers-dialog.css       (../shared/preferences/containers-dialog.css)
   skin/classic/browser/fxa/fxa-spinner.svg                     (../shared/fxa/fxa-spinner.svg)
   skin/classic/browser/fxa/sync-illustration.svg               (../shared/fxa/sync-illustration.svg)

browser/themes/shared/preferences/preferences.inc.css

@@ -192,7 +192,7 @@ button > hbox > label {
 }
 
 #category-general > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/general.svg");
+  list-style-image: url("chrome://browser/skin/preferences/general.svg");
 }
 
 #category-home > .category-icon {
@@ -200,15 +200,15 @@ button > hbox > label {
 }
 
 #category-search > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/search.svg");
+  list-style-image: url("chrome://browser/skin/preferences/search.svg");
 }
 
 #category-privacy > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/privacy-security.svg");
+  list-style-image: url("chrome://browser/skin/preferences/privacy-security.svg");
 }
 
 #category-sync > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/sync.svg");
+  list-style-image: url("chrome://browser/skin/preferences/sync.svg");
 }
 
 /* header */
@@ -763,17 +763,17 @@ dialog > .sync-engines-list + hbox {
 
 .sync-engine-bookmarks .checkbox-icon,
 .sync-engine-bookmarks.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/bookmark.svg");
+  list-style-image: url("chrome://browser/skin/preferences/bookmark.svg");
 }
 
 .sync-engine-history .checkbox-icon,
 .sync-engine-history.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/history.svg");
+  list-style-image: url("chrome://browser/skin/preferences/history.svg");
 }
 
 .sync-engine-tabs .checkbox-icon,
 .sync-engine-tabs.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/tab.svg");
+  list-style-image: url("chrome://browser/skin/preferences/tab.svg");
 }
 
 .sync-engine-passwords .checkbox-icon,
@@ -783,17 +783,17 @@ dialog > .sync-engines-list + hbox {
 
 .sync-engine-addons .checkbox-icon,
 .sync-engine-addons.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/extensions.svg");
+  list-style-image: url("chrome://browser/skin/preferences/extensions.svg");
 }
 
 .sync-engine-prefs .checkbox-icon,
 .sync-engine-prefs.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/preferences.svg");
+  list-style-image: url("chrome://browser/skin/preferences/preferences.svg");
 }
 
 .sync-engine-addresses .checkbox-icon,
 .sync-engine-addresses.sync-engine-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/formfill.svg");
+  list-style-image: url("chrome://browser/skin/preferences/formfill.svg");
 }
 
 .fxaMobilePromo {
@@ -839,7 +839,7 @@ image.update-throbber {
 }
 
 .face-sad {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/face-sad.svg");
+  list-style-image: url("chrome://browser/skin/preferences/face-sad.svg");
   width: 20px;
   height: 20px;
   margin-block: 5px;
@@ -847,7 +847,7 @@ image.update-throbber {
 }
 
 .face-smile {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/face-smile.svg");
+  list-style-image: url("chrome://browser/skin/preferences/face-smile.svg");
   width: 20px;
   height: 20px;
   margin-block: 5px;
@@ -963,7 +963,7 @@ menulist[indicator=true] > menupopup menuitem:not([image]) > .menu-iconic-left >
 }
 
 menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url(chrome://browser/skin/preferences/in-content/search-arrow-indicator.svg);
+  list-style-image: url(chrome://browser/skin/preferences/search-arrow-indicator.svg);
 }
 
 menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .menu-iconic-left > .menu-iconic-icon:-moz-locale-dir(rtl) {
@@ -984,13 +984,13 @@ menulist[indicator=true] > menupopup menuitem[indicator=true]:not([image]) > .me
 }
 
 .no-results-image {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/no-search-results.svg");
+  list-style-image: url("chrome://browser/skin/preferences/no-search-results.svg");
   width: 380px;
   height: 293px;
 }
 
 #no-results-message[query*=🔥🦊] {
-  background-image: url("chrome://browser/skin/preferences/in-content/critters-postcard.jpg");
+  background-image: url("chrome://browser/skin/preferences/critters-postcard.jpg");
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;

browser/themes/shared/preferences/search.css

@@ -16,7 +16,7 @@
 }
 
 .searchBarHiddenImage {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/no-search-bar.svg");
+  list-style-image: url("chrome://browser/skin/preferences/no-search-bar.svg");
 }
 
 #searchBarShownRadio {
@@ -25,7 +25,7 @@
 }
 
 .searchBarShownImage {
-  list-style-image: url("chrome://browser/skin/preferences/in-content/search-bar.svg");
+  list-style-image: url("chrome://browser/skin/preferences/search-bar.svg");
 }
 
 #defaultEngine,

browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css

@@ -171,7 +171,7 @@ p {
 .banner-body {
   margin: auto;
   width: max-content;
-  background-image: url("chrome://browser/skin/preferences/in-content/general.svg");
+  background-image: url("chrome://browser/skin/preferences/general.svg");
   background-position: left 0 top 50px;
   background-repeat: no-repeat;
   background-size: 32px;

browser/themes/windows/preferences/dialog.css

@@ -2,7 +2,7 @@
    - 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/incontentprefs/dialog.inc.css
+%include ../../shared/preferences/dialog.inc.css
 
 :root > * {
   font-size: 1.12em;

browser/themes/windows/preferences/preferences.css

@@ -2,7 +2,7 @@
    - 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/incontentprefs/preferences.inc.css
+%include ../../shared/preferences/preferences.inc.css
 
 /* Global rules */
 body {

toolkit/content/aboutTelemetry.css

@@ -170,7 +170,7 @@ section:not(.active) {
 }
 
 .no-search-results-image {
-  background-image: url("chrome://browser/skin/preferences/in-content/no-search-results.svg");
+  background-image: url("chrome://browser/skin/preferences/no-search-results.svg");
   width: 380px;
   height: 293px;
 }

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

@@ -1112,7 +1112,7 @@ html|*.help-icon {
 }
 
 .preferences-icon {
-  background-image: url("chrome://browser/skin/preferences/in-content/general.svg");
+  background-image: url("chrome://browser/skin/preferences/general.svg");
 }
 
 .addons-icon {