Remove ImageView::SetImage() with ImageSkia param

In favor of ui::ImageModel, this version of SetImage should be
deprecated. This patch doesn't have any intended behavioral change.

Bug: 40137576
Change-Id: I05f3d16ca910f21630c0b3d5efdf0f5dcd1c2b1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6196494
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: SangWoo Ko <sangwoo108@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1416752}

ash/app_list/views/app_list_item_view.cc

@@ -846,7 +846,7 @@ void AppListItemView::SetIconAndMaybeHostBadgeIcon(
 
   // Clear icon and bail out if item icon is empty.
   if (icon.isNull()) {
-    icon_->SetImage(nullptr);
+    icon_->SetImage(ui::ImageModel());
     icon_image_model_ =
         ui::ImageModel(ui::ImageModel::FromImageSkia(gfx::ImageSkia()));
     return;

ash/capture_mode/disclaimer_view.cc

@@ -138,12 +138,11 @@ DisclaimerView::DisclaimerView(
   SetBackground(views::CreateThemedRoundedRectBackground(
       cros_tokens::kCrosSysDialogContainer, kRadius));
   SetPaintToLayer();
-  AddChildView(
-      views::Builder<views::ImageView>()
-          .SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-              IDR_MAGIC_BOOST_DISCLAIMER_ILLUSTRATION))
-          .SetPreferredSize(kImagePreferredSize)
-          .Build());
+  AddChildView(views::Builder<views::ImageView>()
+                   .SetImage(ui::ImageModel::FromResourceId(
+                       IDR_MAGIC_BOOST_DISCLAIMER_ILLUSTRATION))
+                   .SetPreferredSize(kImagePreferredSize)
+                   .Build());
 
   AddChildView(
       views::Builder<views::ScrollView>()

ash/system/holding_space/pinned_files_section.cc

@@ -62,8 +62,9 @@ constexpr int kPlaceholderGSuiteIconSpacing = 8;
 
 // Create a builder for an image view for the given G Suite icon.
 views::Builder<views::ImageView> CreateGSuiteIcon(const gfx::VectorIcon& icon) {
-  return views::Builder<views::ImageView>().SetImage(gfx::CreateVectorIcon(
-      icon, kPlaceholderGSuiteIconSize, gfx::kPlaceholderColor));
+  return views::Builder<views::ImageView>().SetImage(
+      ui::ImageModel::FromVectorIcon(icon, gfx::kPlaceholderColor,
+                                     kPlaceholderGSuiteIconSize));
 }
 #endif
 

ash/system/magic_boost/magic_boost_disclaimer_view.cc

@@ -201,9 +201,8 @@ MagicBoostDisclaimerView::MagicBoostDisclaimerView(
       .SetPaintToLayer()
       .AddChildren(
           views::Builder<views::ImageView>()
-              .SetImage(
-                  ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                      IDR_MAGIC_BOOST_DISCLAIMER_ILLUSTRATION))
+              .SetImage(ui::ImageModel::FromResourceId(
+                  IDR_MAGIC_BOOST_DISCLAIMER_ILLUSTRATION))
               .SetPreferredSize(kImagePreferredSize),
           views::Builder<views::ScrollView>()
               .SetBackgroundColor(std::nullopt)

ash/wm/window_restore/informed_restore_contents_view.cc

@@ -421,7 +421,7 @@ void InformedRestoreContentsView::CreateChildViews() {
                 views::Builder<views::ImageView>()
                     .CopyAddressTo(&image_view_)
                     .SetPaintToLayer()
-                    .SetImage(image)
+                    .SetImage(ui::ImageModel::FromImageSkia(image))
                     .SetImageSize(screenshot_size))
             .Build());
 

ash/wm/window_restore/informed_restore_item_view.cc

@@ -195,8 +195,10 @@ void InformedRestoreItemView::OnAllFaviconsLoaded(
           .SetBackground(views::CreateThemedRoundedRectBackground(
               cros_tokens::kCrosSysPrimary, kFaviconPreferredSize.width()));
     } else {
-      builder.SetImage(gfx::ImageSkiaOperations::CreateResizedImage(
-          favicon, skia::ImageOperations::RESIZE_BEST, kFaviconPreferredSize));
+      builder.SetImage(ui::ImageModel::FromImageSkia(
+          gfx::ImageSkiaOperations::CreateResizedImage(
+              favicon, skia::ImageOperations::RESIZE_BEST,
+              kFaviconPreferredSize)));
     }
 
     favicon_container_view_->AddChildView(std::move(builder).Build());

chrome/browser/ash/app_restore/arc_ghost_window_view.cc

@@ -159,7 +159,7 @@ void ArcGhostWindowView::SetGhostWindowViewType(arc::GhostWindowType type) {
   if (type == arc::GhostWindowType::kFullRestore) {
     // If not enabled new style flag, all types will use original UI.
     AddChildView(views::Builder<views::ImageView>()
-                     .SetImage(icon_raw_data_)
+                     .SetImage(ui::ImageModel::FromImageSkia(icon_raw_data_))
                      .SetAccessibleName(l10n_util::GetStringUTF16(
                          IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_ICON))
                      .SetID(ContentID::ID_ICON_IMAGE)
@@ -231,14 +231,15 @@ void ArcGhostWindowView::OnIconLoaded(apps::IconValuePtr icon_value) {
 void ArcGhostWindowView::AddCommonChildrenViews() {
   static_cast<views::BoxLayout*>(GetLayoutManager())
       ->set_between_child_spacing(kSpaceBetweenIconAndMessage);
-  AddChildView(views::Builder<views::ImageView>()
-                   .SetImage(ResizeAndShadowedImage(
-                       icon_raw_data_,
-                       gfx::Size(kAppIconSizeNewStyle, kAppIconSizeNewStyle)))
-                   .SetAccessibleName(l10n_util::GetStringUTF16(
-                       IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_ICON))
-                   .SetID(ContentID::ID_ICON_IMAGE)
-                   .Build());
+  AddChildView(
+      views::Builder<views::ImageView>()
+          .SetImage(ui::ImageModel::FromImageSkia(ResizeAndShadowedImage(
+              icon_raw_data_,
+              gfx::Size(kAppIconSizeNewStyle, kAppIconSizeNewStyle))))
+          .SetAccessibleName(l10n_util::GetStringUTF16(
+              IDS_ARC_GHOST_WINDOW_APP_LAUNCHING_ICON))
+          .SetID(ContentID::ID_ICON_IMAGE)
+          .Build());
 }
 
 void ArcGhostWindowView::AddChildrenViewsForFixupType() {

chrome/browser/chromeos/policy/dlp/dialogs/policy_dialog_base.cc

@@ -135,7 +135,7 @@ void PolicyDialogBase::AddRowIcon(const gfx::ImageSkia& icon,
   views::ImageView* icon_view =
       row->AddChildView(std::make_unique<views::ImageView>());
   icon_view->SetImageSize(gfx::Size(kFaviconSize, kFaviconSize));
-  icon_view->SetImage(icon);
+  icon_view->SetImage(ui::ImageModel::FromImageSkia(icon));
 }
 
 views::Label* PolicyDialogBase::AddRowTitle(const std::u16string& title,

chrome/browser/ui/views/autofill/payments/local_card_migration_dialog_view.cc

@@ -78,7 +78,7 @@ class AutofillMigrationHeaderView : public views::ImageView {
   // views::Label:
   void OnThemeChanged() override {
     ImageView::OnThemeChanged();
-    SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+    SetImage(ui::ImageModel::FromResourceId(
         GetNativeTheme()->ShouldUseDarkColors()
             ? IDR_AUTOFILL_MIGRATION_DIALOG_HEADER_DARK
             : IDR_AUTOFILL_MIGRATION_DIALOG_HEADER));

chrome/browser/ui/views/autofill/payments/local_card_migration_error_dialog_view.cc

@@ -91,11 +91,10 @@ void LocalCardMigrationErrorDialogView::Init() {
 
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   auto* image = new views::ImageView();
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  image->SetImage(
-      rb.GetImageSkiaNamed(GetNativeTheme()->ShouldUseDarkColors()
-                               ? IDR_AUTOFILL_MIGRATION_DIALOG_HEADER_DARK
-                               : IDR_AUTOFILL_MIGRATION_DIALOG_HEADER));
+  image->SetImage(ui::ImageModel::FromResourceId(
+      GetNativeTheme()->ShouldUseDarkColors()
+          ? IDR_AUTOFILL_MIGRATION_DIALOG_HEADER_DARK
+          : IDR_AUTOFILL_MIGRATION_DIALOG_HEADER));
   image->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_AUTOFILL_GOOGLE_PAY_LOGO_ACCESSIBLE_NAME));
   AddChildView(image);

chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc

@@ -146,8 +146,7 @@ PluginVmInstallerView::PluginVmInstallerView(Profile* profile)
   views::ImageView* logo_image = new views::ImageView();
   logo_image->SetImageSize(kLogoImageSize);
   logo_image->SetImage(
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          IDR_LOGO_PLUGIN_VM_DEFAULT_192));
+      ui::ImageModel::FromResourceId(IDR_LOGO_PLUGIN_VM_DEFAULT_192));
   logo_image->SetHorizontalAlignment(views::ImageView::Alignment::kLeading);
   upper_container_view->AddChildView(logo_image);
 
@@ -617,8 +616,7 @@ void PluginVmInstallerView::SetBigImage() {
     big_image_->SetImageSize(size);
     lower_container_layout_->set_inside_border_insets(
         gfx::Insets::TLBR(0, 0, bottom_inset, 0));
-    big_image_->SetImage(
-        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(image_id));
+    big_image_->SetImage(ui::ImageModel::FromResourceId(image_id));
   };
 
   if (state_ == State::kError) {

chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc

@@ -83,11 +83,10 @@ class LogoView : public views::ImageView {
 
   void OnThemeChanged() override {
     ImageView::OnThemeChanged();
-    SetImage(ui::ResourceBundle::GetSharedInstance()
-                 .GetImageNamed((GetNativeTheme()->ShouldUseDarkColors())
-                                    ? IDR_PRODUCT_LOGO_ENTERPRISE_WHITE
-                                    : IDR_PRODUCT_LOGO_ENTERPRISE)
-                 .AsImageSkia());
+    SetImage(
+        ui::ImageModel::FromResourceId((GetNativeTheme()->ShouldUseDarkColors())
+                                           ? IDR_PRODUCT_LOGO_ENTERPRISE_WHITE
+                                           : IDR_PRODUCT_LOGO_ENTERPRISE));
     const gfx::Rect logo_bounds = GetImageBounds();
     SetImageSize(gfx::Size(
         logo_bounds.width() * kLogoHeight / logo_bounds.height(), kLogoHeight));

chrome/browser/ui/views/promos/ios_promo_password_bubble.cc

@@ -115,10 +115,10 @@ std::unique_ptr<views::View> CreateFooter(
   auto footer_title_container =
       views::Builder<views::BoxLayoutView>()
           .SetOrientation(views::BoxLayout::Orientation::kHorizontal)
-          .AddChild(views::Builder<views::ImageView>()
-                        .SetImage(ui::ResourceBundle::GetSharedInstance()
-                                      .GetImageSkiaNamed(IDR_PRODUCT_LOGO_32))
-                        .SetImageSize(gfx::Size(20, 20)))
+          .AddChild(
+              views::Builder<views::ImageView>()
+                  .SetImage(ui::ImageModel::FromResourceId(IDR_PRODUCT_LOGO_32))
+                  .SetImageSize(gfx::Size(20, 20)))
           .AddChild(views::Builder<views::Label>()
                         .SetText(l10n_util::GetStringUTF16(
                             IDS_IOS_PASSWORD_PROMO_BUBBLE_FOOTER_TITLE))
@@ -231,7 +231,7 @@ std::unique_ptr<views::View> CreateFooter(
   views::ImageView* image_view =
       views::AsViewClass<views::ImageView>(qr_code_views.front());
 
-  image_view->SetImage(qr_image.value());
+  image_view->SetImage(ui::ImageModel::FromImageSkia(qr_image.value()));
 
   return built_footer_view;
 }

chrome/browser/ui/views/translate/partial_translate_bubble_view.cc

@@ -104,10 +104,7 @@ std::unique_ptr<views::View> CreateWordmarkView() {
   const int translate_icon_id = IDR_TRANSLATE_TAB_WORDMARK;
   std::unique_ptr<views::ImageView> translate_icon =
       std::make_unique<views::ImageView>();
-  gfx::ImageSkia* translate_icon_image =
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          translate_icon_id);
-  translate_icon->SetImage(*translate_icon_image);
+  translate_icon->SetImage(ui::ImageModel::FromResourceId(translate_icon_id));
   view->AddChildView(std::move(translate_icon));
 
   return view;

chrome/browser/ui/views/translate/translate_bubble_view.cc

@@ -101,13 +101,10 @@ std::unique_ptr<views::View> CreateWordmarkView() {
   view->SetLayoutManager(std::make_unique<views::BoxLayout>());
 
   // Translate icon
-  const int translate_icon_id = IDR_TRANSLATE_TAB_WORDMARK;
   std::unique_ptr<views::ImageView> translate_icon =
       std::make_unique<views::ImageView>();
-  gfx::ImageSkia* translate_icon_image =
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          translate_icon_id);
-  translate_icon->SetImage(*translate_icon_image);
+  translate_icon->SetImage(
+      ui::ImageModel::FromResourceId(IDR_TRANSLATE_TAB_WORDMARK));
   view->AddChildView(std::move(translate_icon));
 
   return view;

components/live_caption/views/caption_bubble.cc

@@ -1451,7 +1451,8 @@ void CaptionBubble::SetTextColor() {
   media_foundation_renderer_error_text_->AddStyleRange(
       gfx::Range(offset + link.length(), text.length()), error_message_style);
   media_foundation_renderer_error_icon_->SetImage(
-      gfx::CreateVectorIcon(vector_icons::kErrorOutlineIcon, primary_color));
+      ui::ImageModel::FromVectorIcon(vector_icons::kErrorOutlineIcon,
+                                     primary_color));
   media_foundation_renderer_error_checkbox_->SetEnabledTextColors(
       primary_color);
   media_foundation_renderer_error_checkbox_->SetTextSubpixelRenderingEnabled(

ui/views/controls/image_view.h

@@ -41,19 +41,6 @@ class VIEWS_EXPORT ImageView : public ImageViewBase {
 
   ~ImageView() override;
 
-  // Set the image that should be displayed.
-  // TODO(pkasting): Change callers to pass an ImageModel and eliminate this.
-  void SetImage(const gfx::ImageSkia& image) {
-    SetImage(ui::ImageModel::FromImageSkia(image));
-  }
-
-  // Set the image that should be displayed from a pointer. Reset the image
-  // if the pointer is NULL.
-  // TODO(pkasting): Change callers to pass an ImageModel and eliminate this.
-  void SetImage(const gfx::ImageSkia* image_skia) {
-    SetImage(image_skia ? *image_skia : gfx::ImageSkia());
-  }
-
   // Sets the image that should be displayed.
   void SetImage(const ui::ImageModel& image_model);
 
@@ -95,8 +82,6 @@ class VIEWS_EXPORT ImageView : public ImageViewBase {
 };
 
 BEGIN_VIEW_BUILDER(VIEWS_EXPORT, ImageView, ImageViewBase)
-VIEW_BUILDER_OVERLOAD_METHOD(SetImage, const gfx::ImageSkia&)
-VIEW_BUILDER_OVERLOAD_METHOD(SetImage, const gfx::ImageSkia*)
 VIEW_BUILDER_OVERLOAD_METHOD(SetImage, const ui::ImageModel&)
 END_VIEW_BUILDER
 

ui/views/controls/image_view_unittest.cc

@@ -105,7 +105,7 @@ TEST_P(ImageViewTest, CenterAlignment) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(kImageSkiaSize, kImageSkiaSize);
   gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
-  image_view()->SetImage(image_skia);
+  image_view()->SetImage(ui::ImageModel::FromImageSkia(image_skia));
   views::test::RunScheduledLayout(image_view());
   EXPECT_NE(gfx::Size(), image_skia.size());
 
@@ -145,7 +145,7 @@ TEST_P(ImageViewTest, ImageOriginForCustomViewBounds) {
   constexpr int kImageSkiaSize = 20;
   bitmap.allocN32Pixels(kImageSkiaSize, kImageSkiaSize);
   gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
-  image_view()->SetImage(image_skia);
+  image_view()->SetImage(ui::ImageModel::FromImageSkia(image_skia));
 
   EXPECT_EQ(gfx::Point(30, 30), image_view()->GetImageBounds().origin());
   EXPECT_EQ(image_view_bounds, image_view()->bounds());