| 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 4be01c467e9ac7955991d467eada20941d6d5217..11e5b3ddd95c974d463f50c27d0c688aabda45e3 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/translate_decoration.mm
|
| @@ -10,17 +10,32 @@
|
| #include "chrome/grit/generated_resources.h"
|
| #include "grit/theme_resources.h"
|
| #include "ui/base/l10n/l10n_util_mac.h"
|
| +#include "ui/base/material_design/material_design_controller.h"
|
| +#include "ui/gfx/color_palette.h"
|
| +#include "ui/gfx/image/image_skia_util_mac.h"
|
| +#include "ui/gfx/paint_vector_icon.h"
|
| +#include "ui/gfx/vector_icons_public.h"
|
|
|
| TranslateDecoration::TranslateDecoration(CommandUpdater* command_updater)
|
| : command_updater_(command_updater) {
|
| - SetLit(false);
|
| + SetLit(false, false);
|
| }
|
|
|
| TranslateDecoration::~TranslateDecoration() {}
|
|
|
| -void TranslateDecoration::SetLit(bool on) {
|
| - const int image_id = on ? IDR_TRANSLATE_ACTIVE : IDR_TRANSLATE;
|
| - SetImage(OmniboxViewMac::ImageForResource(image_id));
|
| +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 {
|
| + const int image_id = on ? IDR_TRANSLATE_ACTIVE : IDR_TRANSLATE;
|
| + SetImage(OmniboxViewMac::ImageForResource(image_id));
|
| + }
|
| }
|
|
|
| NSPoint TranslateDecoration::GetBubblePointInFrame(NSRect frame) {
|
|
|