Chromium Code Reviews| Index: ui/gfx/paint_vector_icon.cc |
| diff --git a/ui/gfx/paint_vector_icon.cc b/ui/gfx/paint_vector_icon.cc |
| index 6091897f811fc773251f92deea66959cd3b0014f..087d0ee31fe093820c8f115d438fd825708316eb 100644 |
| --- a/ui/gfx/paint_vector_icon.cc |
| +++ b/ui/gfx/paint_vector_icon.cc |
| @@ -405,7 +405,10 @@ ImageSkia CreateVectorIconWithBadge(VectorIconId id, |
| size_t dip_size, |
| SkColor color, |
| VectorIconId badge_id) { |
| - return g_icon_cache.Get().GetOrCreateIcon(id, dip_size, color, badge_id); |
| + return (id == VectorIconId::VECTOR_ICON_NONE) |
|
Evan Stade
2016/03/30 21:44:13
After thinking about this more, the thing that wor
Peter Kasting
2016/03/30 21:53:23
Why do you say most containers will ignore Preferr
|
| + ? gfx::ImageSkia() |
| + : g_icon_cache.Get().GetOrCreateIcon(id, dip_size, color, |
| + badge_id); |
| } |
| ImageSkia CreateVectorIconFromSource(const std::string& source, |