Update permission icons in settings page to GM3 icons
Icons updated: Location, Mic, Camera, Notification and embedded content
This CL also creates a dedicated icons file for icons solely used in the privacy settings pages.
Screenshots: crbug.com/336555906#comment22
Bug: 336555906
Change-Id: I3fe7a248a22d29d61f7aa2d20990cdc87d4e2a38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5729855
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Ravjit Uppal <ravjit@chromium.org>
Auto-Submit: Ravjit Uppal <ravjit@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1332856}
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
index a70731d..bdaea9d 100644
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -372,6 +372,7 @@
icons_html_files = [
"icons.html",
+ "privacy_icons.html",
"privacy_page/fingerprint_icons.html",
"privacy_sandbox/privacy_sandbox_icons.html",
"site_settings/all_sites_icons.html",
diff --git a/chrome/browser/resources/settings/OWNERS b/chrome/browser/resources/settings/OWNERS
index 34c4640d..7db5cf5 100644
--- a/chrome/browser/resources/settings/OWNERS
+++ b/chrome/browser/resources/settings/OWNERS
@@ -12,3 +12,5 @@
# Settings icons
per-file icons.html=rainhard@chromium.org
+# Privacy settings icons
+per-file privacy_icons.html=rainhard@chromium.org,sideyilmaz@chromium.org
diff --git a/chrome/browser/resources/settings/icons.html b/chrome/browser/resources/settings/icons.html
index 13cfce8..19f37c6 100644
--- a/chrome/browser/resources/settings/icons.html
+++ b/chrome/browser/resources/settings/icons.html
@@ -191,7 +191,7 @@
<g id="system" viewBox="0 -960 960 960">
<path d="M666-163 475-354q-20 8-43.5 12.5T384-337q-99 0-169.5-70T144-576q0-37.78 9.5-71.89T182-711l144 144 70-70-144-144q29-17 62.5-26t69.5-9q100 0 170 71t70 170.19q0 22.81-4.5 42.31Q615-513 607-493l195 194q14 14.35 14 34.67Q816-244 802-230l-68 67q-14.09 14-34.04 14Q680-149 666-163Zm34-68 35-34-215-213q20-24 26-52.5t6-44.5q0-66.85-47.5-116.42Q457-741 390-744l82 81q11 11.18 11 26.09t-11.29 26.12L351.29-491.21Q340-480 325.82-480T301-491l-85-85q0 69 49.5 118T384-409q17 0 47-7t56-28l213 213ZM476-488Z"></path>
</g>
-
+
<!-- Navigation: Web GM3 icon -->
<g id="web" viewBox="0 -960 960 960">
<path d="M168-192q-29.7 0-50.85-21.16Q96-234.32 96-264.04v-432.24Q96-726 117.15-747T168-768h624q29.7 0 50.85 21.16Q864-725.68 864-695.96v432.24Q864-234 842.85-213T792-192H168Zm0-72h624v-360H168v360Z"></path>
@@ -279,16 +279,15 @@
<g id="language"><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2 0 .68.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68.07-1.35.16-2h4.68c.09.65.16 1.32.16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2 0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z"></path></g>
<g id="local-fonts"><path d="M0 0h24v24H0V0z" fill="none"></path><path d="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm0 18H4V4h16v16zM10.69 6h2.6l4.51 12h-2.5l-1.01-2.87H9.7L8.7 18H6.2l4.49-12zm2.87 7.06l-1.06-3.02-.43-1.44h-.13l-.44 1.44-1.07 3.02h3.13z"></path></g>
<g id="local-fonts-off"><path d="M4.83,2H20c1.1,0,2,0.9,2,2v15.17l-2-2V4H6.83L4.83,2z M10.92,6l-0.57,1.52l1.36,1.36l0.23-0.66h0.1l0.54,1.52l3.04,3.04 L13.07,6H10.92z M20.49,23.31L19.17,22H4c-1.1,0-2-0.9-2-2V4.83L0.69,3.51L2.1,2.1l19.8,19.8L20.49,23.31z M17.17,20l-5.07-5.07 H9.58L8.49,18H6.41l2.39-6.37L4,6.83V20H17.17z"></path></g>
- <g id="location-on"><path d="M12,2C8.13,2,5,5.13,5,9c0,5.34,4.21,6.79,6.03,12.28C11.17,21.7,11.55,22,12,22s0.83-0.3,0.97-0.72 C14.79,15.79,19,14.34,19,9C19,5.13,15.87,2,12,2z M12,11.5c-1.38,0-2.5-1.12-2.5-2.5c0-1.38,1.12-2.5,2.5-2.5s2.5,1.12,2.5,2.5 C14.5,10.38,13.38,11.5,12,11.5z"></path></g>
- <g id="location-off"><path d="M12,6.88c1.38,0,2.5,1.12,2.5,2.5c0,0.64-0.25,1.21-0.64,1.65l3.38,3.38C18.24,12.95,19,11.39,19,9.13c0-3.87-3.13-7-7-7 c-1.94,0-3.7,0.79-4.97,2.07l3.32,3.32C10.79,7.13,11.36,6.88,12,6.88z"></path><path d="M2.81,2.81L1.39,4.22l3.72,3.72C5.04,8.33,5,8.72,5,9.13c0,5.34,4.21,6.79,6.03,12.28c0.14,0.42,0.52,0.72,0.97,0.72 s0.83-0.3,0.97-0.72c0.49-1.49,1.17-2.68,1.88-3.74l4.93,4.93l1.41-1.41L2.81,2.81z"></path></g>
+ <g id="location-on" viewBox="0 -960 960 960">
+ <path d="M480.28-96q-13.71 0-23.49-7.5Q447-111 443-123q-19-53-45.5-100.5T321-335q-49-63-79.5-121T211-595.21Q211-707 289.3-785.5 367.6-864 480-864q112.4 0 190.7 78.42Q749-707.15 749-594.57q0 87.57-33.5 145.07T639-335q-52 68-78.5 114.5T517-123q-5 12-14.5 19.5T480.28-96ZM480-223q17-34 38.5-67.27Q540-323.55 582-379q42-54 68.5-100.36Q677-525.71 677-595q0-81-58-139t-139.5-58q-81.5 0-139 58T283-595q0 69.29 27 115.64Q337-433 378-379q42 55.45 63.5 88.73Q463-257 480-223Zm0-275q40 0 68.5-28.5T577-595q0-40-28.5-68.5T480-692q-40 0-68.5 28.5T383-595q0 40 28.5 68.5T480-498Zm0-97Z"></path>
+ </g>
<g id="lock-outline"><path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zM8.9 6c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1v2H8.9V6zM18 20H6V10h12v10z"></path></g>
<g id="mic-off"><path d="M19,11h-2c0,0.91-0.25,1.76-0.68,2.49l1.45,1.45C18.54,13.82,19,12.47,19,11z M2.81,2.81L1.39,4.22l11.66,11.66 C12.71,15.96,12.36,16,12,16c-2.76,0-5-2.24-5-5H5c0,3.53,2.61,6.43,6,6.92V21h2v-3.08c0.57-0.08,1.12-0.24,1.64-0.45l5.14,5.14 l1.41-1.41L2.81,2.81z M15,11V5c0-1.66-1.34-3-3-3S9,3.34,9,5v1.17l5.81,5.81C14.92,11.67,15,11.35,15,11z"></path></g>
<g id="midi"><path d="M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z M14,14.5h0.25V19h-4.5v-4.5H10 c0.55,0,1-0.45,1-1V5h2v8.5C13,14.05,13.45,14.5,14,14.5z M5,5h2v8.5c0,0.55,0.45,1,1,1h0.25V19H5V5z M19,19h-3.25v-4.5H16 c0.55,0,1-0.45,1-1V5h2V19z"></path></g>
<g id="midi-off"><path d="M21.19,21.19L2.81,2.81L1.39,4.22L3,5.83V19c0,1.1,0.9,2,2,2h13.17l1.61,1.61L21.19,21.19z M8.25,19H5V7.83l2,2v3.67 c0,0.55,0.45,1,1,1h0.25V19z M9.75,19v-4.5H10c0.46,0,0.82-0.31,0.94-0.73l3.31,3.31V19H9.75z M11,8.17L5.83,3H19c1.1,0,2,0.9,2,2 v13.17l-2-2V5h-2v8.5c0,0.19-0.07,0.36-0.16,0.51L13,10.17V5h-2V8.17z"></path></g>
<g id="music-note"><path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"></path></g>
- <g id="notifications"><path d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"></path></g>
<g id="notifications-none"><path d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.9 2 2 2zm6-6v-5c0-3.07-1.63-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.64 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2zm-2 1H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6z"></path></g>
- <g id="notifications-off"><path d="M18,10c0-2.79-1.91-5.14-4.5-5.8V3.5C13.5,2.67,12.83,2,12,2s-1.5,0.67-1.5,1.5v0.7C9.64,4.42,8.87,4.84,8.21,5.38 L18,15.17V10z M12,22c1.1,0,2-0.9,2-2h-4C10,21.1,10.9,22,12,22z M2.81,2.81L1.39,4.22L6.1,8.93C6.04,9.28,6,9.63,6,10v7H4v2h12.17 l3.61,3.61l1.41-1.41L2.81,2.81z"></path></g>
<g id="open-in-new-off"><path d="M17.59,5H14V3h7v7h-2V6.41l-4.88,4.88l-1.41-1.41L17.59,5z M19,12v4.17l2,2V12H19z M19.78,22.61L18.17,21H5 c-1.11,0-2-0.9-2-2V5.83L1.39,4.22l1.41-1.41l18.38,18.38L19.78,22.61z M16.17,19l-4.88-4.88L9.7,15.71L8.29,14.3l1.59-1.59L5,7.83 V19H16.17z M7.83,5H12V3H5.83L7.83,5z"></path></g>
<g id="open-in-browser"><path d="M20 4H4c-1.1 0-2 .9-2 2v12c0 1.11.9 2 2 2h5v-2H4V9h16v9h-5v2h5c1.1 0 2-.89 2-2V6c0-1.1-.9-2-2-2zm-3.79 10.21L12 10l-4.21 4.21 1.42 1.41L11 13.83V20h2v-6.17l1.79 1.79z"></path></g>
<g id="pdf"><path d="M7 11.5h1v-1H7v1zM19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-9.5 8.5c0 .83-.67 1.5-1.5 1.5H7v2H5.5V9H8c.83 0 1.5.67 1.5 1.5v1zm10-1H17v1h1.5V13H17v2h-1.5V9h4v1.5zm-5 3c0 .83-.67 1.5-1.5 1.5h-2.5V9H13c.83 0 1.5.67 1.5 1.5v3zm-2.5 0h1v-3h-1v3z"></path><path fill="none" d="M0 0h24v24H0z"></path></g>
@@ -307,14 +306,11 @@
<g id="sensors-off"><path d="M16.94,6.91l-1.41,1.45c0.9,0.94,1.46,2.22,1.46,3.64c0,0.65-0.12,1.26-0.33,1.83l1.52,1.52c0.52-1,0.81-2.15,0.81-3.36 C18.99,10.02,18.21,8.21,16.94,6.91z M19.77,4l-1.41,1.45C19.98,7.13,21,9.44,21,12.01c0,1.78-0.48,3.44-1.32,4.84l1.46,1.46 c1.18-1.8,1.87-3.96,1.87-6.29C23,8.88,21.77,6.05,19.77,4z M11.83,9c0.06,0,0.11,0,0.17,0c1.66,0,3,1.34,3,3c0,0.06,0,0.11,0,0.17 L11.83,9z M20.49,23.31L12.17,15c-0.06,0-0.11,0-0.17,0c-1.66,0-3-1.34-3-3c0-0.06,0-0.11,0-0.17l-1.67-1.67 C7.13,10.74,7.01,11.35,7.01,12c0,1.42,0.56,2.7,1.46,3.64l-1.41,1.45c-1.27-1.3-2.05-3.1-2.05-5.09c0-1.21,0.29-2.36,0.8-3.36 L4.32,7.15C3.48,8.55,3,10.21,3,11.99c0,2.57,1.02,4.88,2.64,6.56L4.23,20C2.23,17.95,1,15.12,1,11.99c0-2.33,0.69-4.5,1.87-6.29 L0.69,3.51L2.1,2.1l19.8,19.8L20.49,23.31z"></path></g>
<g id="serial-port"><path d="M22 9V7h-2V5c0-1.1-.9-2-2-2H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2v-2h2v-2h-2v-2h2v-2h-2V9h2zm-4 10H4V5h14v14zM6 13h5v4H6zm6-6h4v3h-4zM6 7h5v5H6zm6 4h4v6h-4z"></path></g>
<g id="serial-port-off"><path d="M7.83,5H18v10.17L19.83,17H22v-2h-2v-2h2v-2h-2V9h2V7h-2V5c0-1.1-0.9-2-2-2H5.83L7.83,5z M12,9.17V7h4v3h-3.17L12,9.17z M9.83,7H11v1.17L9.83,7z M13.83,11H16v2.17L13.83,11z M18,21c0.06,0,0.11,0,0.16-0.01l2.32,2.32l1.41-1.41L2.1,2.1L0.69,3.51 l1.32,1.32C2,4.89,2,4.94,2,5v14c0,1.1,0.9,2,2,2H18z M4,19V6.83l2,2V12h3.17l1,1H6v4h5v-3.17l1,1V17h2.17l2,2H4z"></path></g>
- <g id="storage-access"><path d="M8 17.75c-1.785-.45-3.23-1.395-4.336-2.836C2.554 13.473 2 11.832 2 10c0-2.234.773-4.125 2.324-5.676C5.875 2.774 7.766 2 10 2c1.832 0 3.473.555 4.914 1.664C16.355 4.77 17.301 6.214 17.75 8h-2.102a5.953 5.953 0 0 0-2.187-2.898C12.437 4.367 11.285 4 10 4c-1.668 0-3.082.582-4.25 1.75C4.582 6.918 4 8.332 4 10c0 1.285.367 2.438 1.102 3.46A5.953 5.953 0 0 0 8 15.649ZM12 22c-.55 0-1.02-.195-1.414-.586A1.935 1.935 0 0 1 10 20v-8c0-.55.195-1.02.586-1.414.394-.39.863-.586 1.414-.586h8c.55 0 1.02.195 1.414.586.39.394.586.863.586 1.414v8c0 .55-.195 1.02-.586 1.414-.394.39-.863.586-1.414.586Zm0-2h8v-8h-8Zm.5-1h7l-2.3-3-1.7 2.25-1.2-1.648Zm3.5-3ZM9.824 9.824Zm0 0"></path></g>
- <g id="storage-access-off"><path d="m22 19.176-2-2V12h-5.176l-2-2H20c.55 0 1.02.195 1.414.586.39.394.586.863.586 1.414ZM15.648 8a5.953 5.953 0 0 0-2.187-2.898C12.437 4.367 11.285 4 10 4c-.45 0-.89.05-1.324.148a6.549 6.549 0 0 0-1.25.426L5.949 3.102a7.706 7.706 0 0 1 1.95-.829A8.08 8.08 0 0 1 10 2c1.832 0 3.473.555 4.914 1.664C16.355 4.77 17.301 6.214 17.75 8Zm-1.046 9.398Zm5.875 5.903L19.199 22H12c-.55 0-1.02-.195-1.414-.586A1.935 1.935 0 0 1 10 20v-7.2L4.602 7.399a6.97 6.97 0 0 0-.438 1.25A5.52 5.52 0 0 0 4 10c0 1.285.367 2.438 1.102 3.46A5.953 5.953 0 0 0 8 15.649v2.102c-1.785-.45-3.23-1.395-4.336-2.836C2.554 13.473 2 11.832 2 10c0-.75.102-1.465.3-2.148.2-.684.473-1.329.825-1.926l-2.5-2.5 1.398-1.403 19.875 19.875Zm-9.5-15.176Zm-1.801 1.05ZM12.5 19l1.8-2.398 1.2 1.648 1.176-1.574L19 19Zm-.5 1h5.2L12 14.8Zm5.426-5.426Zm0 0"></path></g>
<g id="sync-off"><path d="M12 1.05V4.05C16.35 4.05 19.95 7.65 19.95 12C19.95 13.35 19.5 14.7 18.9 15.9L17.4 14.4C17.85 13.65 18 12.9 18 12C18 8.7 15.3 6 12 6V8.85L8.1 4.95L12 1.05ZM19.35 22.5L15.9 19.05L12 22.95V19.95C7.65 19.95 4.05 16.35 4.05 12C4.05 10.65 4.5 9.3 5.1 8.1L1.5 4.65L3.15 3L21 20.85L19.35 22.5ZM12 15.15L6.45 9.6C6.15 10.35 6 11.1 6 12C6 15.3 8.7 18 12 18V15.15Z"></path></g>
<g id="sync-disabled"><path d="M10 6.35V4.26c-.8.21-1.55.54-2.23.96l1.46 1.46c.25-.12.5-.24.77-.33zm-7.14-.94l2.36 2.36C4.45 8.99 4 10.44 4 12c0 2.21.91 4.2 2.36 5.64L4 20h6v-6l-2.24 2.24C6.68 15.15 6 13.66 6 12c0-1 .25-1.94.68-2.77l8.08 8.08c-.25.13-.5.25-.77.34v2.09c.8-.21 1.55-.54 2.23-.96l2.36 2.36 1.27-1.27L4.14 4.14 2.86 5.41zM20 4h-6v6l2.24-2.24C17.32 8.85 18 10.34 18 12c0 1-.25 1.94-.68 2.77l1.46 1.46C19.55 15.01 20 13.56 20 12c0-2.21-.91-4.2-2.36-5.64L20 4z"></path></g>
<g id="sync-problem"><path d="M3 12c0 2.21.91 4.2 2.36 5.64L3 20h6v-6l-2.24 2.24C5.68 15.15 5 13.66 5 12c0-2.61 1.67-4.83 4-5.65V4.26C5.55 5.15 3 8.27 3 12zm8 5h2v-2h-2v2zM21 4h-6v6l2.24-2.24C18.32 8.85 19 10.34 19 12c0 2.61-1.67 4.83-4 5.65v2.09c3.45-.89 6-4.01 6-7.74 0-2.21-.91-4.2-2.36-5.64L21 4zm-10 9h2V7h-2v6z"></path></g>
<g id="usb"><path d="M15 7v4h1v2h-3V5h2l-3-4-3 4h2v8H8v-2.07c.7-.37 1.2-1.08 1.2-1.93 0-1.21-.99-2.2-2.2-2.2-1.21 0-2.2.99-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37-1.2 1.1-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2-.98 2.2-2.2 0-.85-.49-1.58-1.2-1.95V15h3c1.11 0 2-.89 2-2v-2h1V7h-4z"></path></g>
<g id="usb-off"><path d="M15,8h4v4h-1v2c0,0.34-0.08,0.66-0.23,0.94L16,13.17V12h-1V8z M11,8.17l2,2V6h2l-3-4L9,6h2V8.17z M13,16v2.28 c0.6,0.34,1,0.98,1,1.72c0,1.1-0.9,2-2,2s-2-0.9-2-2c0-0.74,0.4-1.37,1-1.72V16H8c-1.11,0-2-0.89-2-2v-2.28C5.4,11.38,5,10.74,5,10 c0-0.59,0.26-1.13,0.68-1.49L1.39,4.22l1.41-1.41l18.38,18.38l-1.41,1.41L13.17,16H13z M11,14v-0.17l-2.51-2.51 c-0.14,0.16-0.31,0.29-0.49,0.4V14H11z"></path></g>
- <g id="videocam-off"><path d="M21 18L9 6H16C16.55 6 17 6.45 17 7V10.5L21 6.5V18ZM21.8 21.6L17 16.8L6.2 6L2.6 2.4L1.2 3.8L3.53 6.13C3.22 6.3 3 6.62 3 7V17C3 17.55 3.45 18 4 18H15.4L20.4 23L21.8 21.6Z"></path></g>
<g id="volume-down"><path d="M1 13H4.46667L8 16.5V3.5L4.46667 7H1V13ZM10 6.5V13.5C11.776 12.8652 12.5 11.0043 12.5 10C12.5 8.99565 11.776 7.14348 10 6.5Z"></path></g>
<g id="volume-up"><path d="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 3.23v2.06c2.89.86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91 7-4.49 7-8.77s-2.99-7.86-7-8.77z"></path></g>
<g id="volume-up-off"><path d="M16.25,13.42C16.4,12.97,16.5,12.5,16.5,12c0-1.77-1.02-3.29-2.5-4.03v3.2L16.25,13.42z"></path><path d="M19,12c0,1.21-0.31,2.34-0.85,3.32l1.46,1.46C20.48,15.39,21,13.76,21,12c0-4.28-2.99-7.86-7-8.77v2.06 C16.89,6.15,19,8.83,19,12z"></path><path d="M2.81,2.81L1.39,4.22L6.17,9H3v6h4l5,5v-5.17l3.32,3.32c-0.42,0.23-0.85,0.43-1.32,0.56v2.06c1-0.23,1.94-0.62,2.79-1.15 l2.99,2.99l1.41-1.41L2.81,2.81z"></path><polygon points="12,9.17 12,4 9.41,6.59"></polygon></g>
diff --git a/chrome/browser/resources/settings/privacy_icons.html b/chrome/browser/resources/settings/privacy_icons.html
new file mode 100644
index 0000000..f85f156
--- /dev/null
+++ b/chrome/browser/resources/settings/privacy_icons.html
@@ -0,0 +1,32 @@
+<!-- Icons used in the privacy_page/*, site_settings/* and site_settings_page/*
+ pages -->
+<iron-iconset-svg name="privacy" size="24">
+ <svg>
+ <defs>
+ <g id="notifications" viewBox="0 -960 960 960">
+ <path d="M192-216v-72h48v-240q0-87 53.5-153T432-763v-53q0-20 14-34t34-14q20 0 34 14t14 34v53q85 16 138.5 82T720-528v240h48v72H192Zm288-276Zm-.21 396Q450-96 429-117.15T408-168h144q0 30-21.21 51t-51 21ZM312-288h336v-240q0-70-49-119t-119-49q-70 0-119 49t-49 119v240Z"></path>
+ </g>
+ <g id="notifications-off" viewBox="0 -960 960 960">
+ <path d="M192-216v-72h48v-240q0-41 13.5-78.5T290-677l53 53q-15 21-23 45.75T312-528v240h264L90-774l51-52 678 679-51 51-120-120H192Zm528-132-72-72v-108q0-70-49-119t-119-49q-22.84 0-43.92 6Q415-684 395-673l-52-52.51Q363-740 385.5-749q22.5-9 46.5-14v-53q0-20 14-34t34-14q20 0 34 14t14 34v53q85 16 138.5 82T720-528v180Zm-276-72Zm35.79 324Q450-96 429-117.15T408-168h144q0 30-21.21 51t-51 21ZM522-547Z"></path>
+ </g>
+ <g id="storage-access" viewBox="0 -960 960 960">
+ <path d="M312-255q-97-32-156.5-113.5T96-552q0-130 91-221t221-91q102 0 183.5 59.5T705-648h-77q-29-66-88.5-105T408-792q-100 0-170 70t-70 170q0 72 39 131t105 88v78ZM456-96q-29.7 0-50.85-21.15Q384-138.3 384-168v-336q0-29.7 21.15-50.85Q426.3-576 456-576h336q29.7 0 50.85 21.15Q864-533.7 864-504v336q0 29.7-21.15 50.85Q821.7-96 792-96H456Zm0-72h336v-336H456v336Zm24-48h288l-91-120-72 95-53-71-72 96Zm144-120ZM398-563Z"></path>
+ </g>
+ <g id="storage-access-off" viewBox="0 -960 960 960">
+ <path d="m864-198-72-72v-234H558l-72-72h306q29.7 0 50.85 21.15Q864-533.7 864-504v306ZM628-648q-29-66-88.5-105T408-792q-28.71 0-56.35 7Q324-778 298-764l-54-53q38-23 79.33-35T408-864q102 0 183.5 59.5T705-648h-77Zm-55 363ZM803-55l-41-41H456q-29.7 0-50.85-21.15Q384-138.3 384-168v-306L195-663q-13 25-20 52.95-7 27.95-7 58.05 0 72 39 131t105 88v78q-97-32-156.5-113.5T96-552q0-45.35 12-86.68Q120-680 142-716l-86-86 51-51 747 747-51 51ZM434-646Zm-77 43Zm123 387 71-96 61 62 42-56 90 90H480Zm-24 48h234L456-402v234Zm219-219Z"></path>
+ </g>
+ <g id="location-off" viewBox="0 -960 960 960">
+ <path d="M480.28-96q-13.71 0-23.49-7.5Q447-111 443-123q-19-53-45.5-100.5T321-335q-49.21-63.41-79.61-121.06Q211-513.71 211-595.37q0-33.63 8-64.63 8-31 22-59l55 54q-6 17-9.5 34t-3.5 36q0 69.29 27 115.64Q337-433 378-379q42 55.45 63.5 88.73Q463-257 480-223q17-34 38.5-67.27Q540-323.55 582-379l51 52q-49 64-74 109t-42 95q-5 12-14.5 19.5T480.28-96ZM677-386l-52-52q23-35 37.5-71.3T677-595q0-81-58-139t-139-58q-44 0-81 17.5T335-728l-52-51q37.06-39.53 87.77-62.27Q421.49-864 480-864q112.4 0 190.7 78.3Q749-707.4 749-595q0 67.39-20.5 116.22T677-386Zm91 296L90-769l51-51 678 679-51 51ZM542-521q15.91-13.73 25.45-32.37Q577-572 577-595q0-40-28.5-68.5T480-692q-23 0-41.63 9.55Q419.73-672.91 406-657l136 136Zm-68-68Zm-63 141Z"></path>
+ </g>
+ <g id="mic" viewBox="0 -960 960 960">
+ <path d="M480-384q-50 0-85-35t-35-85v-240q0-50 35-85t85-35q50 0 85 35t35 85v240q0 50-35 85t-85 35Zm0-240Zm-36 480v-99q-98.8-13.1-163.4-87.05Q216-404 216-504h72q0 79.68 56.23 135.84 56.22 56.16 136 56.16Q560-312 616-368.16q56-56.16 56-135.84h72q0 100-64.6 173.95Q614.8-256.1 516-243v99h-72Zm36-312q20.4 0 34.2-13.8Q528-483.6 528-504v-240q0-20.4-13.8-34.2Q500.4-792 480-792q-20.4 0-34.2 13.8Q432-764.4 432-744v240q0 20.4 13.8 34.2Q459.6-456 480-456Z"></path>
+ </g>
+ <g id="mic-off" viewBox="0 -960 960 960">
+ <path d="m701-361-53-53q11-21 17.33-43.4 6.33-22.41 6.33-46.6H744q0 38-11.18 74.38Q721.64-393.24 701-361ZM477-583Zm117.24 115L528-534v-210q0-20.4-13.8-34.2Q500.4-792 480-792q-20.4 0-34.2 13.8Q432-764.4 432-744v114l-72-72.38V-744q0-50 35-85t85-35q50 0 85 35t35 85v240q0 9-1.5 18t-4.26 18ZM444-144v-99q-99-12-163.5-86.5T216-504h72q0 79.68 56 135.84T480-312q34 0 64.5-13t56.5-35l52 52q-29.3 25.09-64.15 42.55Q554-248 516-243v99h-72Zm324 54L90-769l51-51 678 679-51 51Z"></path>
+ </g>
+ <g id="videocam-off" viewBox="0 -960 960 960">
+ <path d="M864-289 720-433v90l-72-72v-281H366l-72-72h354q29.7 0 50.85 21.15Q720-725.7 720-696v167l144-144v384ZM803-57 56-803l51-51 747 746-51 51ZM507-556ZM406-455ZM194-766l70 69h-48v433h432v-50l72 72q-8 20-25 35t-46.72 15H216q-29 0-50.5-21.19T144-264.14V-697q0-25.58 14.5-43.79T194-766Z"></path>
+ </g>
+ </defs>
+ </svg>
+</iron-iconset-svg>
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index af9ea12..de0251f 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -360,7 +360,7 @@
block-option-label="$i18n{siteSettingsCameraBlocked}"
block-option-sub-label=
"$i18n{siteSettingsCameraBlockedSubLabel}"
- block-option-icon="settings:videocam-off">
+ block-option-icon="privacy:videocam-off">
</settings-category-default-radio-group>
<category-setting-exceptions
category="[[contentSettingsTypesEnum_.CAMERA]]" read-only-list
@@ -501,7 +501,7 @@
block-option-label="$i18n{siteSettingsLocationBlocked}"
block-option-sub-label=
"$i18n{siteSettingsLocationBlockedSubLabel}"
- block-option-icon="settings:location-off">
+ block-option-icon="privacy:location-off">
</settings-category-default-radio-group>
</template>
@@ -548,7 +548,7 @@
name="location-block-radio-button"
sub-label="$i18n{siteSettingsLocationBlockedSubLabel}"
checked$="[[!isLocationAllowed_]]">
- <iron-icon icon="settings:location-off"></iron-icon>
+ <iron-icon icon="privacy:location-off"></iron-icon>
$i18n{siteSettingsLocationBlocked}
</cr-radio-button>
</cr-radio-group>
@@ -684,10 +684,10 @@
category="[[contentSettingsTypesEnum_.MIC]]"
allow-option-label=
"$i18n{siteSettingsMicAllowed}"
- allow-option-icon="cr:mic"
+ allow-option-icon="privacy:mic"
block-option-label="$i18n{siteSettingsMicBlocked}"
block-option-sub-label="$i18n{siteSettingsMicBlockedSubLabel}"
- block-option-icon="settings:mic-off">
+ block-option-icon="privacy:mic-off">
</settings-category-default-radio-group>
<category-setting-exceptions
category="[[contentSettingsTypesEnum_.MIC]]" read-only-list
@@ -758,7 +758,7 @@
name="[[settingsStateEnum_.LOUD]]"
pref="[[prefs.generated.notification]]"
label="$i18n{siteSettingsNotificationsAllowed}"
- icon="settings:notifications">
+ icon="privacy:notifications">
</settings-collapse-radio-button>
<settings-collapse-radio-button no-collapse class="two-line"
@@ -767,7 +767,7 @@
label="$i18n{siteSettingsNotificationsPartial}"
sub-label=
"$i18n{siteSettingsNotificationsPartialSubLabel}"
- icon="settings:notifications">
+ icon="privacy:notifications">
</settings-collapse-radio-button>
<settings-collapse-radio-button no-collapse class="two-line"
@@ -775,7 +775,7 @@
pref="[[prefs.generated.notification]]"
label="$i18n{siteSettingsNotificationsBlocked}"
sub-label="$i18n{siteSettingsNotificationsBlockedSubLabel}"
- icon="settings:notifications-off">
+ icon="privacy:notifications-off">
</settings-collapse-radio-button>
</settings-radio-group>
</template>
@@ -787,7 +787,7 @@
id="notification-ask-radio-button"
name="notification-ask-radio-button"
checked$="[[isNotificationAllowed_]]">
- <iron-icon icon="settings:notifications"></iron-icon>
+ <iron-icon icon="privacy:notifications"></iron-icon>
$i18n{siteSettingsNotificationsAskState}
</cr-radio-button>
@@ -822,7 +822,7 @@
name="notification-block-radio-button"
sub-label="$i18n{siteSettingsNotificationsBlockedSubLabel}"
checked$="[[!isNotificationAllowed_]]">
- <iron-icon icon="settings:notifications-off"></iron-icon>
+ <iron-icon icon="privacy:notifications-off"></iron-icon>
$i18n{siteSettingsNotificationsBlocked}
</cr-radio-button>
</cr-radio-group>
@@ -1305,9 +1305,9 @@
<settings-category-default-radio-group
category="[[contentSettingsTypesEnum_.STORAGE_ACCESS]]"
allow-option-label="$i18n{storageAccessAllowed}"
- allow-option-icon="settings:storage-access"
+ allow-option-icon="privacy:storage-access"
block-option-label="$i18n{storageAccessBlocked}"
- block-option-icon="settings:storage-access-off">
+ block-option-icon="privacy:storage-access-off">
</settings-category-default-radio-group>
<!-- Exceptions section. -->
<div class="content-settings-header">
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
index 00318322..8b75039 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
@@ -16,6 +16,7 @@
import 'chrome://resources/cr_elements/cr_hidden_style.css.js';
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
import '../controls/settings_toggle_button.js';
+import '../privacy_icons.html.js';
import '../safety_hub/safety_hub_module.js';
import '../settings_page/settings_animated_pages.js';
import '../settings_page/settings_subpage.js';
diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
index 35769dd5d..fd13a6f 100644
--- a/chrome/browser/resources/settings/site_settings/site_details.html
+++ b/chrome/browser/resources/settings/site_settings/site_details.html
@@ -152,13 +152,13 @@
icon="cr:videocam" label="$i18n{siteSettingsCamera}">
</site-details-permission>
<site-details-permission category="[[contentSettingsTypesEnum_.MIC]]"
- icon="cr:mic" label="$i18n{siteSettingsMic}">
+ icon="privacy:mic" label="$i18n{siteSettingsMic}">
</site-details-permission>
<site-details-permission category="[[contentSettingsTypesEnum_.SENSORS]]"
icon="settings:sensors" label="$i18n{siteSettingsSensors}">
</site-details-permission>
<site-details-permission category="[[contentSettingsTypesEnum_.NOTIFICATIONS]]"
- icon="settings:notifications"
+ icon="privacy:notifications"
label="$i18n{siteSettingsNotifications}">
</site-details-permission>
<site-details-permission category="[[contentSettingsTypesEnum_.JAVASCRIPT]]"
diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts
index 647b95d6..1f2ff48c 100644
--- a/chrome/browser/resources/settings/site_settings/site_details.ts
+++ b/chrome/browser/resources/settings/site_settings/site_details.ts
@@ -18,6 +18,7 @@
import 'chrome://resources/cr_elements/cr_shared_vars.css.js';
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
import '../icons.html.js';
+import '../privacy_icons.html.js';
import '../settings_shared.css.js';
import './all_sites_icons.html.js';
import './clear_storage_dialog_shared.css.js';
diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
index 669273a..3b09384 100644
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -14,6 +14,7 @@
import 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js';
import 'chrome://resources/cr_elements/cr_shared_style.css.js';
import '../controls/settings_toggle_button.js';
+import '../privacy_icons.html.js';
import '../settings_shared.css.js';
import './recent_site_permissions.js';
import './unused_site_permissions.js';
@@ -216,7 +217,7 @@
route: routes.SITE_SETTINGS_MICROPHONE,
id: Id.MIC,
label: 'siteSettingsMic',
- icon: 'cr:mic',
+ icon: 'privacy:mic',
enabledLabel: 'siteSettingsMicAllowed',
disabledLabel: 'siteSettingsMicBlocked',
},
@@ -283,7 +284,7 @@
route: routes.SITE_SETTINGS_NOTIFICATIONS,
id: Id.NOTIFICATIONS,
label: 'siteSettingsNotifications',
- icon: 'settings:notifications',
+ icon: 'privacy:notifications',
},
{
route: routes.SITE_SETTINGS_PAYMENT_HANDLER,
@@ -372,7 +373,7 @@
route: routes.SITE_SETTINGS_STORAGE_ACCESS,
id: Id.STORAGE_ACCESS,
label: 'siteSettingsStorageAccess',
- icon: 'settings:storage-access',
+ icon: 'privacy:storage-access',
enabledLabel: 'storageAccessAllowed',
disabledLabel: 'storageAccessBlocked',
},
diff --git a/ui/webui/resources/cr_elements/icons.html b/ui/webui/resources/cr_elements/icons.html
index 33e0e32..182ec86 100644
--- a/ui/webui/resources/cr_elements/icons.html
+++ b/ui/webui/resources/cr_elements/icons.html
@@ -330,9 +330,9 @@
<path
d="M18 21H8V8l7-7 1.25 1.25c.117.117.21.273.29.477.073.199.108.39.108.574v.347L15.551 8H21c.535 0 1 .2 1.398.602C22.801 9 23 9.465 23 10v2c0 .117-.012.242-.04.375a1.897 1.897 0 0 1-.108.375l-3 7.05a2.037 2.037 0 0 1-.75.848A1.957 1.957 0 0 1 18 21ZM6 8v13H2V8Zm0 0">
</g>
- <g id="videocam">
+ <g id="videocam" viewBox="0 -960 960 960">
<path
- d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z">
+ d="M216-192q-29 0-50.5-21.5T144-264v-432q0-29.7 21.5-50.85Q187-768 216-768h432q29.7 0 50.85 21.15Q720-725.7 720-696v168l144-144v384L720-432v168q0 29-21.15 50.5T648-192H216Zm0-72h432v-432H216v432Zm0 0v-432 432Z">
</path>
</g>
<g id="warning">
