Bug 1858141 - Adapt clipboard suggestions to the spec. r=mak,fluent-r…

…eviewers,desktop-theme-reviewers,dao

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

browser/components/urlbar/UrlbarProviderClipboard.sys.mjs

@@ -105,7 +105,7 @@ class ProviderClipboard extends UrlbarProvider {
       {
         url: this.#previousClipboard.value,
         title: this.#previousClipboard.value,
-        icon: "chrome://global/skin/icons/edit-copy.svg",
+        icon: "chrome://global/skin/icons/clipboard.svg",
       }
     );
 

browser/components/urlbar/UrlbarView.sys.mjs

@@ -1834,7 +1834,7 @@ export class UrlbarView {
           result.payload.displayUrl = "";
           actionSetter = () => {
             this.#setElementL10n(action, {
-              id: "urlbar-result-action-visit-from-your-clipboard",
+              id: "urlbar-result-action-visit-from-clipboard",
             });
           };
           title.toggleAttribute("is-url", true);
@@ -2835,7 +2835,7 @@ export class UrlbarView {
       { id: "urlbar-result-action-search-tabs" },
       { id: "urlbar-result-action-switch-tab" },
       { id: "urlbar-result-action-visit" },
-      { id: "urlbar-result-action-visit-from-your-clipboard" },
+      { id: "urlbar-result-action-visit-from-clipboard" },
     ];
 
     if (lazy.UrlbarPrefs.get("groupLabels.enabled")) {

browser/components/urlbar/tests/browser/browser_clipboard.js

@@ -70,7 +70,7 @@ add_task(async function testUserEngagementWithClipboardSuggestion() {
       );
       Assert.equal(
         result.icon,
-        "chrome://global/skin/icons/edit-copy.svg",
+        "chrome://global/skin/icons/clipboard.svg",
         "Clipboard suggestion icon"
       );
       await checkClipboardSuggestionAbsent(1);

browser/locales/en-US/browser/browser.ftl

@@ -599,7 +599,7 @@ urlbar-result-action-sponsored = Sponsored
 urlbar-result-action-switch-tab = Switch to Tab
 urlbar-result-action-visit = Visit
 # Allows the user to visit a URL that was previously copied to the clipboard.
-urlbar-result-action-visit-from-your-clipboard = Visit from your clipboard
+urlbar-result-action-visit-from-clipboard = Visit from clipboard
 # Directs a user to press the Tab key to perform a search with the specified
 # engine.
 # Variables

browser/themes/shared/urlbarView.css

@@ -641,8 +641,8 @@
   }
 }
 
-/* Switch-to-tab action text is styled as a chiclet. */
-.urlbarView-row:is([type=switchtab], [type=remotetab]) {
+/* Switch-to-tab and Clipboard action text is styled as a chiclet. */
+.urlbarView-row:is([type=switchtab], [type=remotetab], [type=clipboard]) {
   > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action {
     color: var(--urlbar-box-text-color);
     background-color: var(--urlbar-box-focus-bgcolor);
@@ -663,8 +663,9 @@
   }
 }
 
+.urlbarView:not([action-override]) .urlbarView-row[type=switchtab],
 .urlbarView-row[type=remotetab]:not([selected], :hover),
-.urlbarView:not([action-override]) .urlbarView-row[type=switchtab] {
+.urlbarView-row[type=clipboard] {
   > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator::before {
     /* We make the title separator transparent so it stays in the accessibility
        tree. We want screen readers to pause between the result title and the

toolkit/themes/shared/desktop-jar.inc.mn

@@ -68,6 +68,7 @@
   skin/classic/global/icons/check-filled.svg               (../../shared/icons/check-filled.svg)
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
   skin/classic/global/icons/chevron.svg                    (../../shared/icons/chevron.svg)
+  skin/classic/global/icons/clipboard.svg                  (../../shared/icons/clipboard.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
   skin/classic/global/icons/close-12.svg                   (../../shared/icons/close-12.svg)
   skin/classic/global/icons/close-fill.svg                 (../../shared/icons/close-fill.svg)