Commit 6d2ba51a authored by Kang Minchul's avatar Kang Minchul Committed by Commit Bot

use ui::ImageModel instead of gfx::ImageSkia in IntentPickerBubbleView

Replace gfx::ImageSkia with ui::ImageModel in IntentPickerBubbleView.
There's no intended behavior change.

Bug: 1100034
Change-Id: If2efb3bb22f4fbca3a3025d3f0b24a58cadc25d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2371062
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800873}
parent b4f4d04e
......@@ -97,8 +97,10 @@ class IntentPickerLabelButton : public views::LabelButton {
SetHorizontalAlignment(gfx::ALIGN_LEFT);
SetMinSize(gfx::Size(kMaxIntentPickerLabelButtonWidth, kRowHeight));
SetInkDropMode(InkDropMode::ON);
if (!icon->IsEmpty())
SetImage(views::ImageButton::STATE_NORMAL, *icon->ToImageSkia());
if (!icon->IsEmpty()) {
SetImageModel(views::ImageButton::STATE_NORMAL,
ui::ImageModel::FromImage(*icon));
}
SetBorder(views::CreateEmptyBorder(8, 16, 8, 0));
SetFocusForPlatform();
set_ink_drop_base_color(SK_ColorGRAY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment