Add the kStandard icon type to enum IconCompression.

TODO: Modify IconCompression to IconType. Because IconCompression is
used anywhere, so modify the enum name with a separate CL, so that we
can use the new kStandard anywhere, hidden with the flag in that new
separate CL.

BUG=1083331

Change-Id: I74132ddcfbd2da976e76ec018c9fecf57424d90b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250143
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780158}

chrome/browser/apps/app_service/app_icon_factory.cc

@@ -362,6 +362,8 @@ void IconLoadingPipeline::LoadWebAppIcon(
         }
         FALLTHROUGH;
       case apps::mojom::IconCompression::kUncompressed:
+        FALLTHROUGH;
+      case apps::mojom::IconCompression::kStandard:
         // If |icon_effects| are requested, we must always load the
         // uncompressed image to apply the icon effects, and then re-encode the
         // image if the compressed icon is requested.
@@ -370,6 +372,10 @@ void IconLoadingPipeline::LoadWebAppIcon(
             SkBitmapToImageSkiaCallback(base::BindOnce(
                 &IconLoadingPipeline::MaybeApplyEffectsAndComplete,
                 base::WrapRefCounted(this))));
+
+        // TODO(crbug.com/1083331): For kStandard icons, if the icon is
+        // generated or maskable, modify the icon effect, don't apply
+        // kResizeAndPad to shrink the icon.
         return;
       case apps::mojom::IconCompression::kUnknown:
         break;
@@ -413,6 +419,8 @@ void IconLoadingPipeline::LoadExtensionIcon(
       }
       FALLTHROUGH;
     case apps::mojom::IconCompression::kUncompressed:
+      FALLTHROUGH;
+    case apps::mojom::IconCompression::kStandard:
       // If |icon_effects| are requested, we must always load the
       // uncompressed image to apply the icon effects, and then re-encode
       // the image if the compressed icon is requested.
@@ -470,7 +478,9 @@ void IconLoadingPipeline::LoadIconFromResource(int icon_resource) {
         return;
       }
       FALLTHROUGH;
-    case apps::mojom::IconCompression::kUncompressed: {
+    case apps::mojom::IconCompression::kUncompressed:
+      FALLTHROUGH;
+    case apps::mojom::IconCompression::kStandard: {
       // For compressed icons with |icon_effects|, or for uncompressed
       // icons, we load the uncompressed image, apply the icon effects, and
       // then re-encode the image if necessary.
@@ -514,6 +524,11 @@ void IconLoadingPipeline::MaybeApplyEffectsAndComplete(
   }
   gfx::ImageSkia processed_image = image;
 
+  // TODO(crbug.com/1083331):
+  // 1. For kStandard icons, shrink and apply the mask.
+  // 2. For the default apps, use the raw image, and don't shrink and apply the
+  // mask.
+
   // Apply the icon effects on the uncompressed data. If the caller requests
   // an uncompressed icon, return the uncompressed result; otherwise, encode
   // the icon to a compressed icon, return the compressed result.

chrome/browser/apps/app_service/arc_icon_once_loader.cc

@@ -80,6 +80,10 @@ void ArcIconOnceLoader::SizeSpecificLoader::LoadIcon(
     case apps::mojom::IconCompression::kCompressed:
       icon_type = ArcAppIcon::IconType::kCompressed;
       break;
+    case apps::mojom::IconCompression::kStandard:
+      // TODO(crbug.com/1083331): Set icon_type as
+      // ArcAppIcon::IconType::kTwoLayer.
+      break;
   }
   iter = icons_
              .insert(std::make_pair(

components/services/app_service/public/mojom/types.mojom

@@ -160,9 +160,15 @@ struct IconKey {
 };
 
 enum IconCompression {
+  // Sentinel value used in error cases.
   kUnknown,
+  // Icon as an uncompressed gfx::ImageSkia with no standard Chrome OS mask.
   kUncompressed,
+  // Icon as compressed bytes with no standard Chrome OS mask.
   kCompressed,
+  // Icon as an uncompressed gfx::ImageSkia with the standard Chrome OS mask
+  // applied. This is the default suggested icon type.
+  kStandard,
 };
 
 struct IconValue {