Chromium Code Reviews| Index: chrome/browser/ui/cocoa/location_bar/translate_decoration.mm |
| diff --git a/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm b/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm |
| index 11e5b3ddd95c974d463f50c27d0c688aabda45e3..3f2a13f025c03a39cfe27d0a5525656f911d8487 100644 |
| --- a/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm |
| +++ b/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm |
| @@ -23,19 +23,21 @@ TranslateDecoration::TranslateDecoration(CommandUpdater* command_updater) |
| TranslateDecoration::~TranslateDecoration() {} |
| -void TranslateDecoration::SetLit(bool on, bool locationBarIsDark) { |
| - if (ui::MaterialDesignController::IsModeMaterial()) { |
| - SkColor vectorIconColor = locationBarIsDark ? SK_ColorWHITE |
| - : gfx::kChromeIconGrey; |
| - NSImage* theImage = |
| - NSImageFromImageSkia(gfx::CreateVectorIcon(gfx::VectorIconId::TRANSLATE, |
| - 16, |
| - vectorIconColor)); |
| - SetImage(theImage); |
| - } else { |
| +void TranslateDecoration::SetLit(bool on, bool location_bar_is_dark) { |
| + if (!ui::MaterialDesignController::IsModeMaterial()) { |
| const int image_id = on ? IDR_TRANSLATE_ACTIVE : IDR_TRANSLATE; |
| SetImage(OmniboxViewMac::ImageForResource(image_id)); |
| + return; |
| } |
| + SkColor vector_icon_color; |
| + vector_icon_color = location_bar_is_dark ? SkColorSetA(SK_ColorWHITE, 0xCC) |
|
tapted
2016/04/28 14:29:44
This 0xCC appears in a few places, so does kIconSi
|
| + : gfx::kChromeIconGrey; |
| + const int kIconSize = 16; |
| + NSImage* theImage = |
| + NSImageFromImageSkia(gfx::CreateVectorIcon(gfx::VectorIconId::TRANSLATE, |
| + kIconSize, |
| + vector_icon_color)); |
| + SetImage(theImage); |
| } |
| NSPoint TranslateDecoration::GetBubblePointInFrame(NSRect frame) { |