crostini: Generic penguin and terminal icons are updated.

Bug: 1131714
Change-Id: Idefdd5ce7c4ae3ca8a99018de500f329ebb39b62
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592847Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Matt Giuca <mgiuca@chromium.org>
Reviewed-by: David Munro <davidmunro@google.com>
Commit-Queue: Nicholas Verne <nverne@chromium.org>
Auto-Submit: Nicholas Verne <nverne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840485}

chrome/app/theme/chrome_unscaled_resources.grd

@@ -121,9 +121,8 @@
         <!-- Borealis icons -->
         <include name="IDR_LOGO_BOREALIS_DEFAULT_192" file="borealis/logo_borealis_default_192.png" type="BINDATA" />
         <!-- Crostini icons -->
-        <include name="IDR_LOGO_CROSTINI_TERMINAL" file="crostini/logo_crostini_terminal.png" type="BINDATA" />
-        <include name="IDR_LOGO_CROSTINI_DEFAULT_32" file="crostini/logo_crostini_default_32.png" type="BINDATA" />
-        <include name="IDR_LOGO_CROSTINI_DEFAULT_192" file="crostini/logo_crostini_default_192.png" type="BINDATA" />
+        <include name="IDR_LOGO_CROSTINI_TERMINAL" file="crostini/ic_terminal_256.png" type="BINDATA" />
+        <include name="IDR_LOGO_CROSTINI_DEFAULT" file="crostini/ic_linux_256.png" type="BINDATA" />
         <include name="IDR_CROSTINI_MASCOT" file="crostini/crostini_mascot_1x.svg" type="BINDATA" />
         <include name="IDR_LINUX_ILLUSTRATION" file="crostini/linux_illustration_2x.png" type="BINDATA" />
         <include name="IDR_LINUX_SUCCESS_ILLUSTRATION" file="crostini/linux_success_illustration.svg" type="BINDATA" />

chrome/browser/apps/app_service/app_icon_factory.cc

@@ -697,7 +697,7 @@ void IconLoadingPipeline::LoadIconFromResource(int icon_resource) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
-  if (icon_resource == IDR_LOGO_CROSTINI_DEFAULT_192 ||
+  if (icon_resource == IDR_LOGO_CROSTINI_DEFAULT ||
       icon_resource == IDR_APP_DEFAULT_ICON) {
     // For the Crostini penguin icon, clear the standard icon effects, and use
     // the raw icon.

chrome/browser/apps/app_service/app_icon_factory_unittest.cc

@@ -210,8 +210,7 @@ class AppIconFactoryTest : public testing::Test {
                                apps::IconEffects icon_effects,
                                apps::mojom::IconValuePtr& output_icon) {
     bool is_placeholder_icon = false;
-    apps::LoadIconFromResource(icon_type, kSizeInDip,
-                               IDR_LOGO_CROSTINI_DEFAULT_192,
+    apps::LoadIconFromResource(icon_type, kSizeInDip, IDR_LOGO_CROSTINI_DEFAULT,
                                is_placeholder_icon, icon_effects,
                                base::BindOnce(
                                    [](apps::mojom::IconValuePtr* result,
@@ -227,7 +226,7 @@ class AppIconFactoryTest : public testing::Test {
   void GenerateCrostiniPenguinIcon(gfx::ImageSkia& output_image_skia) {
     output_image_skia =
         *(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-            IDR_LOGO_CROSTINI_DEFAULT_192));
+            IDR_LOGO_CROSTINI_DEFAULT));
     output_image_skia = gfx::ImageSkiaOperations::CreateResizedImage(
         output_image_skia, skia::ImageOperations::RESIZE_BEST,
         gfx::Size(kSizeInDip, kSizeInDip));
@@ -238,7 +237,7 @@ class AppIconFactoryTest : public testing::Test {
   void GenerateCrostiniPenguinCompressedIcon(std::vector<uint8_t>& output) {
     base::StringPiece data =
         ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_LOGO_CROSTINI_DEFAULT_192);
+            IDR_LOGO_CROSTINI_DEFAULT);
     output = std::vector<uint8_t>(data.begin(), data.end());
   }
 #endif

chrome/browser/apps/app_service/crostini_apps.cc

@@ -133,7 +133,7 @@ void CrostiniApps::LoadIcon(const std::string& app_id,
                             bool allow_placeholder_icon,
                             LoadIconCallback callback) {
   registry_->LoadIcon(app_id, std::move(icon_key), icon_type, size_hint_in_dip,
-                      allow_placeholder_icon, IDR_LOGO_CROSTINI_DEFAULT_192,
+                      allow_placeholder_icon, IDR_LOGO_CROSTINI_DEFAULT,
                       std::move(callback));
 }
 

chrome/browser/chromeos/web_applications/terminal_system_web_app_info.cc

@@ -26,7 +26,7 @@ std::unique_ptr<WebApplicationInfo> CreateWebAppInfoForTerminalSystemWebApp() {
     info->scope = GURL(chrome::kChromeUIUntrustedTerminalURL);
   info->title = l10n_util::GetStringUTF16(IDS_CROSTINI_TERMINAL_APP_NAME);
   web_app::CreateIconInfoForSystemWebApp(
-      info->start_url, {{"app_icon_192.png", 192, IDR_LOGO_CROSTINI_TERMINAL}},
+      info->start_url, {{"app_icon_256.png", 256, IDR_LOGO_CROSTINI_TERMINAL}},
       *info);
   info->background_color = 0xFF202124;
   info->display_mode = blink::mojom::DisplayMode::kStandalone;

chrome/browser/task_manager/providers/vm/crostini_process_task.cc

@@ -17,7 +17,7 @@ gfx::ImageSkia* CrostiniProcessTask::s_icon_ = nullptr;
 CrostiniProcessTask::CrostiniProcessTask(base::ProcessId pid,
                                          const std::string& owner_id,
                                          const std::string& vm_name)
-    : VmProcessTask(FetchIcon(IDR_LOGO_CROSTINI_DEFAULT_32, &s_icon_),
+    : VmProcessTask(FetchIcon(IDR_LOGO_CROSTINI_DEFAULT, &s_icon_),
                     IDS_TASK_MANAGER_LINUX_VM_PREFIX,
                     pid,
                     owner_id,