Use LabelButton::SetImageModel() instead of SetImage().

ui::ImageModel should be preferred to ui::Image or ui::ImageSkia.
There's no intended behavior change.

Bug: 1100034
Change-Id: Iaf12012c2da76503a04062e29527118b3f730f3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2385035Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Sang Woo Ko <sangwoo108@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803713}

ui/base/models/image_model.cc

@@ -5,6 +5,7 @@
 #include <tuple>
 
 #include "ui/base/models/image_model.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace ui {
 
@@ -83,6 +84,12 @@ ImageModel ImageModel::FromImageSkia(const gfx::ImageSkia& image_skia) {
   return ImageModel(image_skia);
 }
 
+// static
+ImageModel ImageModel::FromResourceId(int resource_id) {
+  return ImageModel::FromImage(
+      ResourceBundle::GetSharedInstance().GetImageNamed(resource_id));
+}
+
 bool ImageModel::IsEmpty() const {
   return !IsVectorIcon() && !IsImage();
 }

ui/base/models/image_model.h

@@ -88,6 +88,7 @@ class COMPONENT_EXPORT(UI_BASE) ImageModel {
                                    int icon_size = 0);
   static ImageModel FromImage(const gfx::Image& image);
   static ImageModel FromImageSkia(const gfx::ImageSkia& image_skia);
+  static ImageModel FromResourceId(int resource_id);
 
   bool IsEmpty() const;
   bool IsVectorIcon() const;

ui/views/button_drag_utils.cc

@@ -6,6 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/models/image_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/canvas_painter.h"
 #include "ui/gfx/canvas.h"
@@ -65,12 +66,11 @@ void SetDragImage(const GURL& url,
   }
   button.SetMaxSize(gfx::Size(kLinkDragImageMaxWidth, 0));
   if (icon.isNull()) {
-    button.SetImage(views::Button::STATE_NORMAL,
-                    *ui::ResourceBundle::GetSharedInstance()
-                         .GetImageNamed(IDR_DEFAULT_FAVICON)
-                         .ToImageSkia());
+    button.SetImageModel(views::Button::STATE_NORMAL,
+                         ui::ImageModel::FromResourceId(IDR_DEFAULT_FAVICON));
   } else {
-    button.SetImage(views::Button::STATE_NORMAL, icon);
+    button.SetImageModel(views::Button::STATE_NORMAL,
+                         ui::ImageModel::FromImageSkia(icon));
   }
 
   gfx::Size size(button.GetPreferredSize());

ui/views/examples/button_example.cc

@@ -89,11 +89,11 @@ void ButtonExample::LabelButtonPressed(LabelButton* label_button,
               ? kLongText
               : label_button->GetText().length() > 50 ? kLabelButton : ""));
     } else if (event.IsAltDown()) {
-      label_button->SetImage(
+      label_button->SetImageModel(
           Button::STATE_NORMAL,
           label_button->GetImage(Button::STATE_NORMAL).isNull()
-              ? *icon_
-              : gfx::ImageSkia());
+              ? ui::ImageModel::FromImageSkia(*icon_)
+              : ui::ImageModel());
     } else {
       static int alignment = 0;
       label_button->SetHorizontalAlignment(

ui/views/examples/colored_dialog_example.cc

@@ -64,8 +64,9 @@ class TextVectorImageButton : public views::MdTextButton {
     views::MdTextButton::OnThemeChanged();
 
     // Use the text color for the associated vector image.
-    SetImage(views::Button::ButtonState::STATE_NORMAL,
-             gfx::CreateVectorIcon(icon_, label()->GetEnabledColor()));
+    SetImageModel(
+        views::Button::ButtonState::STATE_NORMAL,
+        ui::ImageModel::FromVectorIcon(icon_, label()->GetEnabledColor()));
   }
 
  private: