Use gallery icon for chrome://media-app in m83.

This adds a new IDR resource id, to decouple the shown-icon from any
icon asset that gets brought in via DEPS.

Bug: b/150637102
Change-Id: I55b98e9fe7cf0d3fde4a87661d9dfbd39dc12ea7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2120661
Commit-Queue: Trent Apted <tapted@chromium.org>
Reviewed-by: Patti <patricialor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753538}

chromeos/components/media_app_ui/media_app_ui.cc

@@ -31,13 +31,13 @@ content::WebUIDataSource* CreateHostDataSource() {
                           IDR_MEDIA_APP_MOJO_API_BOOTSTRAP_JS);
   source->AddResourcePath("media_app.mojom-lite.js",
                           IDR_MEDIA_APP_MEDIA_APP_MOJOM_JS);
-
   source->AddResourcePath("media_app_index_scripts.js",
                           IDR_MEDIA_APP_INDEX_SCRIPTS_JS);
 
-  // Add resources from chromeos_media_app_bundle_resources.pak.
+  // TODO(b/141588875): Switch this back to IDR_MEDIA_APP_APP_ICON_256_PNG (and
+  // add more icon resolutions) when the final icon is ready.
   source->AddResourcePath("system_assets/app_icon_256.png",
-                          IDR_MEDIA_APP_APP_ICON_256_PNG);
+                          IDR_MEDIA_APP_GALLERY_ICON_256_PNG);
 
   return source;
 }

chromeos/components/media_app_ui/resources/media_app_resources.grd

@@ -15,6 +15,7 @@
       <include name="IDR_MEDIA_APP_MOJO_API_BOOTSTRAP_JS" file="js/mojo_api_bootstrap.js" compress="brotli" type="BINDATA" />
       <include name="IDR_MEDIA_APP_MEDIA_APP_MOJOM_JS" file="${root_gen_dir}/chromeos/components/media_app_ui/media_app_ui.mojom-lite.js" use_base_dir="false" compress="brotli" type="BINDATA" />
       <include name="IDR_MEDIA_APP_INDEX_SCRIPTS_JS" file="js/media_app_index_scripts.js" flattenhtml="true" compress="brotli" type="BINDATA" />
+      <include name="IDR_MEDIA_APP_GALLERY_ICON_256_PNG" file="../../../../ui/file_manager/gallery/images/icon256.png" type="BINDATA" />
 
       <!-- Unprivileged guest contents. -->
       <include name="IDR_MEDIA_APP_APP_HTML" file="app.html" type="BINDATA" />