Commit ba928849 authored by Chris Lu's avatar Chris Lu Committed by Commit Bot

[ios] Use Infobar Settings asset in badge popup menu

This change is meant to reduce image redundancy.

Bug: 976901
Change-Id: If42ded707cd0bd40b397b1d309b4804e28efb361
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825540
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700796}
parent 01a64a07
......@@ -32,7 +32,6 @@ source_set("badges") {
]
deps = [
":public",
"resources:badge_menu_item_gear",
"resources:incognito_badge",
"resources:incognito_small_badge",
"resources:wrench_badge",
......@@ -45,6 +44,7 @@ source_set("badges") {
"//ios/chrome/browser/ui/elements",
"//ios/chrome/browser/ui/fullscreen:ui",
"//ios/chrome/browser/ui/infobars:feature_flags",
"//ios/chrome/browser/ui/infobars/resources:infobar_settings_icon",
"//ios/chrome/browser/ui/list_model",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/web",
......
......@@ -146,7 +146,7 @@ const CGFloat kVerticalMargin = 8;
_trailingImageView = [[UIImageView alloc]
initWithImage:
[[UIImage imageNamed:@"badge_menu_item_gear"]
[[UIImage imageNamed:@"infobar_settings_icon"]
imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]];
_trailingImageView.translatesAutoresizingMaskIntoConstraints = NO;
_trailingImageView.tintColor = [UIColor colorNamed:kBlueColor];
......
......@@ -27,11 +27,3 @@ imageset("wrench_badge") {
"wrench_badge.imageset/wrench_badge@3x.png",
]
}
imageset("badge_menu_item_gear") {
sources = [
"badge_menu_item_gear.imageset/Contents.json",
"badge_menu_item_gear.imageset/badge_menu_item_gear@2x.png",
"badge_menu_item_gear.imageset/badge_menu_item_gear@3x.png",
]
}
{
"images": [
{
"idiom": "universal",
"scale": "2x",
"filename": "badge_menu_item_gear@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "badge_menu_item_gear@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
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