Make all the menu UI consitent with the new chromeos menu spec.

chrome/browser/ui/views/wrench_menu.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 280 matching lines @@
                                         l10n_util::GetStringUTF16(string_id));
     button->SetAccessibleName(
         GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id));
     button->set_focusable(true);
     button->set_request_focus_on_press(false);
     button->set_tag(index);
     button->SetEnabled(menu_model_->IsEnabledAt(index));
     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_config_views (or create
menu_config_aura if necessary).

[jennyz, 2012/04/30 21:23:09]

Done.

+#endif
     if (background)
       *background = bg;
     button->set_border(new MenuButtonBorder());
     button->set_alignment(TextButton::ALIGN_CENTER);
     button->SetFont(views::MenuConfig::instance().font);
     button->ClearMaxTextSize();
     AddChildView(button);
     return button;
   }
 
@@ skipping 88 matching lines @@
         decrement_button_(NULL),
         fullscreen_button_(NULL),
         zoom_label_width_(0) {
     decrement_button_ = CreateButtonWithAccName(
         IDS_ZOOM_MINUS2, MenuButtonBackground::LEFT_BUTTON, decrement_index,
         NULL, IDS_ACCNAME_ZOOM_MINUS2);
 
     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);
     zoom_label_->set_background(center_bg);
     zoom_label_->set_border(new MenuButtonBorder());
     zoom_label_->SetFont(MenuConfig::instance().font);
     AddChildView(zoom_label_);
     zoom_label_width_ = MaxWidthForZoomLabel();
 
     increment_button_ = CreateButtonWithAccName(
@@ skipping 493 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }