Chromium Code Reviews| Index: chrome/browser/ui/views/wrench_menu.cc |
| diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc |
| index 753e80f3a1205fc5f0f5c47be743d1b436ac9fa8..620a049b301bc74bfbcc5aa66fb39ae133076643 100644 |
| --- a/chrome/browser/ui/views/wrench_menu.cc |
| +++ b/chrome/browser/ui/views/wrench_menu.cc |
| @@ -298,7 +298,9 @@ class WrenchMenuView : public ScheduleAllView, public views::ButtonListener { |
| button->set_prefix_type(TextButton::PREFIX_HIDE); |
| MenuButtonBackground* bg = new MenuButtonBackground(type); |
| button->set_background(bg); |
| +#if defined(OS_WIN) && !defined(USE_AURA) |
| button->SetEnabledColor(MenuConfig::instance().text_color); |
|
sky
2012/04/30 20:52:05
Instead of this, initialize text_color in menu_con
jennyz
2012/04/30 21:23:09
Done.
|
| +#endif |
| if (background) |
| *background = bg; |
| button->set_border(new MenuButtonBorder()); |
| @@ -407,7 +409,9 @@ class WrenchMenu::ZoomView : public WrenchMenuView, |
| zoom_label_ = new Label( |
| l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100)); |
| zoom_label_->SetAutoColorReadabilityEnabled(false); |
| +#if defined(OS_WIN) && !defined(USE_AURA) |
| zoom_label_->SetEnabledColor(MenuConfig::instance().text_color); |
| +#endif |
| zoom_label_->SetHorizontalAlignment(Label::ALIGN_RIGHT); |
| MenuButtonBackground* center_bg = |
| new MenuButtonBackground(MenuButtonBackground::CENTER_BUTTON); |