[CR2023] update icons in permission bubble

screenshot: https://screenshot.googleplex.com/mH59tG7MKJiXiG7 Bug: 1422126 Change-Id: I1169b302be659b7ba66b94295e1b0923a5b5c750 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4566828 Commit-Queue: Keren Zhu <kerenzhu@chromium.org> Reviewed-by: Peter Boström <pbos@chromium.org> Reviewed-by: Evan Stade <estade@chromium.org> Reviewed-by: Thomas Nguyen <tungnh@chromium.org> Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#1150380}
chromium · May 30, 2023 · ab2d15d · ab2d15d
1 parent 2d9511b
commit ab2d15d
Show file tree

Hide file tree

Showing 24 changed files with 1,117 additions and 75 deletions.
diff --git a/chrome/app/vector_icons/BUILD.gn b/chrome/app/vector_icons/BUILD.gn
@@ -109,7 +109,6 @@ aggregate_vector_icons("chrome_vector_icons") {
     "leading_scroll.icon",
     "link.icon",
     "link_chrome_refresh.icon",
-    "location_on_chrome_refresh.icon",
     "media_controls_arrow_drop_down.icon",
     "media_controls_arrow_drop_up.icon",
     "media_toolbar_button.icon",

diff --git a/chrome/app/vector_icons/location_on_chrome_refresh.icon b/chrome/app/vector_icons/location_on_chrome_refresh.icon
diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -324,7 +324,7 @@ PasswordsAndAutofillSubMenuModel::PasswordsAndAutofillSubMenuModel(
                                      ui::kColorMenuIcon, kDefaultIconSize));
   AddItemWithStringIdAndIcon(
       IDC_SHOW_ADDRESSES, IDS_ADDRESSES_AND_MORE_SUBMENU_OPTION,
-      ui::ImageModel::FromVectorIcon(kLocationOnChromeRefreshIcon,
+      ui::ImageModel::FromVectorIcon(vector_icons::kLocationOnChromeRefreshIcon,
                                      ui::kColorMenuIcon, kDefaultIconSize));
 }
 

diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -564,8 +564,9 @@ void ProfileMenuView::BuildAutofillButtons() {
                           base::Unretained(this)));
 
   AddShortcutFeatureButton(
-      features::IsChromeRefresh2023() ? kLocationOnChromeRefreshIcon
-                                      : vector_icons::kLocationOnIcon,
+      features::IsChromeRefresh2023()
+          ? vector_icons::kLocationOnChromeRefreshIcon
+          : vector_icons::kLocationOnIcon,
       l10n_util::GetStringUTF16(IDS_PROFILES_ADDRESSES_LINK),
       base::BindRepeating(&ProfileMenuView::OnAddressesButtonClicked,
                           base::Unretained(this)));

diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc
@@ -13,6 +13,7 @@
 #include "components/permissions/features.h"
 #include "components/permissions/permission_request.h"
 #include "components/permissions/permissions_client.h"
+#include "ui/base/ui_base_features.h"
 
 #if BUILDFLAG(IS_ANDROID)
 #include "components/resources/android/theme_resources.h"
@@ -68,33 +69,45 @@ int GetIconIdAndroid(RequestType type) {
 
 #if !BUILDFLAG(IS_ANDROID)
 const gfx::VectorIcon& GetIconIdDesktop(RequestType type) {
+  const bool cr23 = ::features::IsChromeRefresh2023();
   switch (type) {
     case RequestType::kAccessibilityEvents:
       return kAccessibilityIcon;
     case RequestType::kArSession:
     case RequestType::kVrSession:
-      return vector_icons::kVrHeadsetIcon;
+      return cr23 ? vector_icons::kVrHeadsetChromeRefreshIcon
+                  : vector_icons::kVrHeadsetIcon;
     case RequestType::kCameraPanTiltZoom:
     case RequestType::kCameraStream:
-      return vector_icons::kVideocamIcon;
+      return cr23 ? vector_icons::kVideocamChromeRefreshIcon
+                  : vector_icons::kVideocamIcon;
     case RequestType::kClipboard:
-      return vector_icons::kContentPasteIcon;
+      return cr23 ? vector_icons::kContentPasteChromeRefreshIcon
+                  : vector_icons::kContentPasteIcon;
     case RequestType::kDiskQuota:
-      return vector_icons::kFolderIcon;
+      return cr23 ? vector_icons::kFolderChromeRefreshIcon
+                  : vector_icons::kFolderIcon;
     case RequestType::kGeolocation:
-      return vector_icons::kLocationOnIcon;
+      return cr23 ? vector_icons::kLocationOnChromeRefreshIcon
+                  : vector_icons::kLocationOnIcon;
     case RequestType::kIdleDetection:
-      return vector_icons::kDevicesIcon;
+      return cr23 ? vector_icons::kDevicesChromeRefreshIcon
+                  : vector_icons::kDevicesIcon;
     case RequestType::kLocalFonts:
-      return vector_icons::kFontDownloadIcon;
+      return cr23 ? vector_icons::kFontDownloadChromeRefreshIcon
+                  : vector_icons::kFontDownloadIcon;
     case RequestType::kMicStream:
-      return vector_icons::kMicIcon;
+      return cr23 ? vector_icons::kMicChromeRefreshIcon
+                  : vector_icons::kMicIcon;
     case RequestType::kMidiSysex:
-      return vector_icons::kMidiIcon;
+      return cr23 ? vector_icons::kMidiChromeRefreshIcon
+                  : vector_icons::kMidiIcon;
     case RequestType::kMultipleDownloads:
-      return vector_icons::kFileDownloadIcon;
+      return cr23 ? vector_icons::kFileDownloadChromeRefreshIcon
+                  : vector_icons::kFileDownloadIcon;
     case RequestType::kNotifications:
-      return vector_icons::kNotificationsIcon;
+      return cr23 ? vector_icons::kNotificationsChromeRefreshIcon
+                  : vector_icons::kNotificationsIcon;
 #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
     case RequestType::kProtectedMediaIdentifier:
       // This icon is provided by ChromePermissionsClient::GetOverrideIconId.
@@ -109,33 +122,44 @@ const gfx::VectorIcon& GetIconIdDesktop(RequestType type) {
       return kUsbSecurityKeyIcon;
     case RequestType::kStorageAccess:
     case RequestType::kTopLevelStorageAccess:
-      return vector_icons::kCookieIcon;
+      return cr23 ? vector_icons::kCookieChromeRefreshIcon
+                  : vector_icons::kCookieIcon;
     case RequestType::kWindowManagement:
-      return vector_icons::kSelectWindowIcon;
+      return cr23 ? vector_icons::kSelectWindowChromeRefreshIcon
+                  : vector_icons::kSelectWindowIcon;
   }
   NOTREACHED();
   return gfx::kNoneIcon;
 }
 
 const gfx::VectorIcon& GetBlockedIconIdDesktop(RequestType type) {
+  const bool cr23 = ::features::IsChromeRefresh2023();
   switch (type) {
     case RequestType::kGeolocation:
-      return vector_icons::kLocationOffIcon;
+      return cr23 ? vector_icons::kLocationOffChromeRefreshIcon
+                  : vector_icons::kLocationOffIcon;
     case RequestType::kNotifications:
-      return vector_icons::kNotificationsOffIcon;
+      return cr23 ? vector_icons::kNotificationsOffChromeRefreshIcon
+                  : vector_icons::kNotificationsOffIcon;
     case RequestType::kArSession:
     case RequestType::kVrSession:
-      return vector_icons::kVrHeadsetOffIcon;
+      return cr23 ? vector_icons::kVrHeadsetOffChromeRefreshIcon
+                  : vector_icons::kVrHeadsetOffIcon;
     case RequestType::kCameraStream:
-      return vector_icons::kVideocamOffIcon;
+      return cr23 ? vector_icons::kVideocamOffChromeRefreshIcon
+                  : vector_icons::kVideocamOffIcon;
     case RequestType::kClipboard:
-      return vector_icons::kContentPasteOffIcon;
+      return cr23 ? vector_icons::kContentPasteOffChromeRefreshIcon
+                  : vector_icons::kContentPasteOffIcon;
     case RequestType::kIdleDetection:
-      return vector_icons::kDevicesOffIcon;
+      return cr23 ? vector_icons::kDevicesOffChromeRefreshIcon
+                  : vector_icons::kDevicesOffIcon;
     case RequestType::kMicStream:
-      return vector_icons::kMicOffIcon;
+      return cr23 ? vector_icons::kMicOffChromeRefreshIcon
+                  : vector_icons::kMicOffIcon;
     case RequestType::kMidiSysex:
-      return vector_icons::kMidiOffIcon;
+      return cr23 ? vector_icons::kMidiOffChromeRefreshIcon
+                  : vector_icons::kMidiOffIcon;
     case RequestType::kStorageAccess:
       return vector_icons::kCookieOffChromeRefreshIcon;
     default:

diff --git a/components/vector_icons/BUILD.gn b/components/vector_icons/BUILD.gn
@@ -51,15 +51,19 @@ aggregate_vector_icons("components_vector_icons") {
     "code_off.icon",
     "content_copy.icon",
     "content_paste.icon",
+    "content_paste_chrome_refresh.icon",
     "content_paste_off.icon",
+    "content_paste_off_chrome_refresh.icon",
     "cookie.icon",
     "cookie_chrome_refresh.icon",
     "cookie_off_chrome_refresh.icon",
     "dangerous.icon",
     "dangerous_chrome_refresh.icon",
     "description.icon",
     "devices.icon",
+    "devices_chrome_refresh.icon",
     "devices_off.icon",
+    "devices_off_chrome_refresh.icon",
     "dogfood.icon",
     "edit.icon",
     "email.icon",
@@ -131,7 +135,9 @@ aggregate_vector_icons("components_vector_icons") {
     "mic_off.icon",
     "mic_off_chrome_refresh.icon",
     "midi.icon",
+    "midi_chrome_refresh.icon",
     "midi_off.icon",
+    "midi_off_chrome_refresh.icon",
     "not_secure_warning.icon",
     "not_secure_warning_chrome_refresh.icon",
     "notification_warning.icon",

diff --git a/components/vector_icons/content_paste_chrome_refresh.icon b/components/vector_icons/content_paste_chrome_refresh.icon
@@ -0,0 +1,81 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 24,
+MOVE_TO, 5.07f, 21.22f,
+R_ARC_TO, 2.19f, 2.19f, 0, 0, 1, -1.6f, -0.67f,
+R_ARC_TO, 2.2f, 2.2f, 0, 0, 1, -0.67f, -1.61f,
+V_LINE_TO, 5.09f,
+R_CUBIC_TO, 0, -0.62f, 0.22f, -1.16f, 0.67f, -1.61f,
+R_ARC_TO, 2.19f, 2.19f, 0, 0, 1, 1.61f, -0.67f,
+R_H_LINE_TO, 3.95f,
+R_CUBIC_TO, 0.21f, -0.6f, 0.59f, -1.09f, 1.15f, -1.46f,
+ARC_TO, 3.19f, 3.19f, 0, 0, 1, 12, 0.79f,
+R_CUBIC_TO, 0.69f, 0, 1.31f, 0.19f, 1.86f, 0.57f,
+R_CUBIC_TO, 0.55f, 0.38f, 0.93f, 0.87f, 1.14f, 1.46f,
+R_H_LINE_TO, 3.93f,
+R_CUBIC_TO, 0.63f, 0, 1.16f, 0.22f, 1.61f, 0.67f,
+R_CUBIC_TO, 0.45f, 0.45f, 0.67f, 0.98f, 0.67f, 1.61f,
+R_V_LINE_TO, 13.86f,
+R_CUBIC_TO, 0, 0.63f, -0.22f, 1.16f, -0.67f, 1.61f,
+R_ARC_TO, 2.19f, 2.19f, 0, 0, 1, -1.6f, 0.67f,
+CLOSE,
+R_MOVE_TO, 0, -2.28f,
+R_H_LINE_TO, 13.86f,
+V_LINE_TO, 5.09f,
+R_H_LINE_TO, -1.96f,
+R_V_LINE_TO, 3.09f,
+H_LINE_TO, 7.03f,
+V_LINE_TO, 5.09f,
+R_H_LINE_TO, -1.96f,
+CLOSE,
+MOVE_TO, 12, 5,
+R_CUBIC_TO, 0.28f, 0, 0.52f, -0.1f, 0.71f, -0.29f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 13, 4,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, -0.29f, -0.71f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 12, 3,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, -0.71f, 0.29f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 11, 4,
+R_CUBIC_TO, 0, 0.28f, 0.1f, 0.52f, 0.29f, 0.71f,
+R_CUBIC_TO, 0.19f, 0.19f, 0.43f, 0.29f, 0.71f, 0.29f,
+CLOSE
+
+CANVAS_DIMENSIONS, 20,
+MOVE_TO, 4.56f, 17.18f,
+R_CUBIC_TO, -0.47f, 0, -0.88f, -0.17f, -1.22f, -0.51f,
+R_ARC_TO, 1.66f, 1.66f, 0, 0, 1, -0.51f, -1.22f,
+V_LINE_TO, 4.57f,
+R_CUBIC_TO, 0, -0.48f, 0.17f, -0.88f, 0.51f, -1.22f,
+R_ARC_TO, 1.67f, 1.67f, 0, 0, 1, 1.22f, -0.51f,
+R_H_LINE_TO, 3.38f,
+R_CUBIC_TO, 0.13f, -0.44f, 0.38f, -0.8f, 0.76f, -1.09f,
+R_CUBIC_TO, 0.38f, -0.29f, 0.81f, -0.43f, 1.31f, -0.43f,
+R_CUBIC_TO, 0.49f, 0, 0.92f, 0.14f, 1.3f, 0.43f,
+R_CUBIC_TO, 0.38f, 0.28f, 0.63f, 0.65f, 0.77f, 1.09f,
+R_H_LINE_TO, 3.38f,
+R_CUBIC_TO, 0.47f, 0, 0.88f, 0.17f, 1.22f, 0.51f,
+R_CUBIC_TO, 0.34f, 0.34f, 0.51f, 0.75f, 0.51f, 1.22f,
+R_V_LINE_TO, 10.88f,
+R_CUBIC_TO, 0, 0.47f, -0.17f, 0.88f, -0.51f, 1.22f,
+R_CUBIC_TO, -0.34f, 0.34f, -0.75f, 0.51f, -1.22f, 0.51f,
+CLOSE,
+R_MOVE_TO, 0, -1.73f,
+H_LINE_TO, 15.44f,
+V_LINE_TO, 4.57f,
+R_H_LINE_TO, -1.46f,
+R_V_LINE_TO, 2.58f,
+H_LINE_TO, 6.02f,
+V_LINE_TO, 4.57f,
+H_LINE_TO, 4.56f,
+CLOSE,
+MOVE_TO, 10, 4.5f,
+R_CUBIC_TO, 0.21f, 0, 0.39f, -0.07f, 0.54f, -0.21f,
+R_ARC_TO, 0.72f, 0.72f, 0, 0, 0, 0.22f, -0.53f,
+R_CUBIC_TO, 0, -0.21f, -0.07f, -0.39f, -0.21f, -0.53f,
+ARC_TO, 0.72f, 0.72f, 0, 0, 0, 10, 3,
+R_CUBIC_TO, -0.21f, 0, -0.39f, 0.07f, -0.53f, 0.22f,
+R_ARC_TO, 0.72f, 0.72f, 0, 0, 0, -0.22f, 0.53f,
+R_CUBIC_TO, 0, 0.21f, 0.07f, 0.39f, 0.22f, 0.54f,
+R_CUBIC_TO, 0.14f, 0.14f, 0.32f, 0.22f, 0.53f, 0.22f,
+CLOSE
diff --git a/components/vector_icons/content_paste_off_chrome_refresh.icon b/components/vector_icons/content_paste_off_chrome_refresh.icon
@@ -0,0 +1,87 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+CANVAS_DIMENSIONS, 24,
+R_MOVE_TO, 21.2f, 18.14f,
+R_LINE_TO, -2.27f, -2.27f,
+V_LINE_TO, 5.09f,
+R_H_LINE_TO, -1.96f,
+R_V_LINE_TO, 3.09f,
+R_H_LINE_TO, -5.72f,
+LINE_TO, 5.88f, 2.82f,
+R_H_LINE_TO, 3.14f,
+R_CUBIC_TO, 0.21f, -0.6f, 0.59f, -1.09f, 1.15f, -1.46f,
+ARC_TO, 3.19f, 3.19f, 0, 0, 1, 12, 0.79f,
+R_CUBIC_TO, 0.69f, 0, 1.31f, 0.19f, 1.86f, 0.57f,
+R_CUBIC_TO, 0.55f, 0.38f, 0.93f, 0.87f, 1.14f, 1.46f,
+R_H_LINE_TO, 3.93f,
+R_CUBIC_TO, 0.63f, 0, 1.16f, 0.22f, 1.61f, 0.67f,
+R_CUBIC_TO, 0.45f, 0.45f, 0.67f, 0.98f, 0.67f, 1.61f,
+CLOSE,
+MOVE_TO, 12, 5,
+R_CUBIC_TO, 0.28f, 0, 0.52f, -0.1f, 0.71f, -0.29f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 13, 4,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, -0.29f, -0.71f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 12, 3,
+R_ARC_TO, 0.96f, 0.96f, 0, 0, 0, -0.71f, 0.29f,
+ARC_TO, 0.96f, 0.96f, 0, 0, 0, 11, 4,
+R_CUBIC_TO, 0, 0.28f, 0.1f, 0.52f, 0.29f, 0.71f,
+R_CUBIC_TO, 0.19f, 0.19f, 0.43f, 0.29f, 0.71f, 0.29f,
+CLOSE,
+R_MOVE_TO, 4.07f, 13.95f,
+R_LINE_TO, -11, -11,
+R_V_LINE_TO, 11,
+CLOSE,
+MOVE_TO, 5.07f, 21.22f,
+R_ARC_TO, 2.19f, 2.19f, 0, 0, 1, -1.6f, -0.67f,
+R_ARC_TO, 2.2f, 2.2f, 0, 0, 1, -0.67f, -1.61f,
+V_LINE_TO, 5.67f,
+LINE_TO, 1.13f, 4,
+R_LINE_TO, 1.48f, -1.48f,
+LINE_TO, 21.49f, 21.39f,
+R_LINE_TO, -1.48f, 1.48f,
+R_LINE_TO, -1.66f, -1.65f,
+CLOSE
+
+CANVAS_DIMENSIONS, 20,
+R_MOVE_TO, 17.17f, 14.86f,
+R_LINE_TO, -1.73f, -1.73f,
+V_LINE_TO, 4.57f,
+R_H_LINE_TO, -1.46f,
+R_V_LINE_TO, 2.58f,
+H_LINE_TO, 9.45f,
+LINE_TO, 5.15f, 2.84f,
+R_LINE_TO, 2.79f, 0.02f,
+R_CUBIC_TO, 0.17f, -0.47f, 0.43f, -0.84f, 0.78f, -1.12f,
+R_CUBIC_TO, 0.35f, -0.28f, 0.78f, -0.42f, 1.29f, -0.42f,
+R_CUBIC_TO, 0.5f, 0, 0.93f, 0.14f, 1.29f, 0.41f,
+R_CUBIC_TO, 0.36f, 0.28f, 0.62f, 0.65f, 0.78f, 1.11f,
+R_H_LINE_TO, 3.38f,
+R_CUBIC_TO, 0.47f, 0, 0.88f, 0.17f, 1.22f, 0.51f,
+R_CUBIC_TO, 0.34f, 0.34f, 0.51f, 0.75f, 0.51f, 1.22f,
+CLOSE,
+MOVE_TO, 10, 4.5f,
+R_CUBIC_TO, 0.21f, 0, 0.39f, -0.07f, 0.54f, -0.21f,
+R_ARC_TO, 0.72f, 0.72f, 0, 0, 0, 0.22f, -0.53f,
+R_CUBIC_TO, 0, -0.21f, -0.07f, -0.39f, -0.21f, -0.53f,
+ARC_TO, 0.72f, 0.72f, 0, 0, 0, 10, 3,
+R_CUBIC_TO, -0.21f, 0, -0.39f, 0.07f, -0.53f, 0.22f,
+R_ARC_TO, 0.72f, 0.72f, 0, 0, 0, -0.22f, 0.53f,
+R_CUBIC_TO, 0, 0.21f, 0.07f, 0.39f, 0.22f, 0.54f,
+R_CUBIC_TO, 0.14f, 0.14f, 0.32f, 0.22f, 0.53f, 0.22f,
+CLOSE,
+R_MOVE_TO, 3.31f, 10.96f,
+R_LINE_TO, -8.75f, -8.75f,
+R_V_LINE_TO, 8.75f,
+CLOSE,
+R_MOVE_TO, -8.75f, 1.73f,
+R_CUBIC_TO, -0.47f, 0, -0.88f, -0.17f, -1.22f, -0.51f,
+R_ARC_TO, 1.66f, 1.66f, 0, 0, 1, -0.51f, -1.22f,
+V_LINE_TO, 4.98f,
+LINE_TO, 1.66f, 3.81f,
+LINE_TO, 2.78f, 2.7f,
+R_LINE_TO, 14.52f, 14.52f,
+R_LINE_TO, -1.11f, 1.11f,
+R_LINE_TO, -1.15f, -1.15f,
+CLOSE