Clean up NativeTheme (particularly CommonTheme).

ui/views/controls/menu/menu_delegate.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 
 #include <set>
 #include <string>
 
@@ skipping 55 matching lines @@
   // radio buttons and check buttons.
   virtual bool IsItemChecked(int id) const;
 
   // The string shown for the menu item. This is only invoked when an item is
   // added with an empty label.
   virtual base::string16 GetLabel(int id) const;
 
   // The font for the menu item label.
   virtual const gfx::FontList* GetLabelFontList(int id) const;
 
-  // Whether this item should be displayed with a bolder color when disabled.
-  virtual bool GetShouldUseDisabledEmphasizedForegroundColor(
-      int command_id) const;
+  // Whether this item should be displayed with the normal text color, even if
+  // it's disabled.
+  virtual bool GetShouldUseNormalForegroundColor(int command_id) const;
 
   // Override the text color of a given menu item dependent on the
   // |command_id| and its |is_hovered| state. Returns true if it chooses to
   // override the color.
   //
   // TODO(erg): Remove this interface. Injecting raw colors into the menu
   // circumvents the NativeTheme.
   virtual bool GetForegroundColor(int command_id,
                                   bool is_hovered,
                                   SkColor* override_color) const;
@@ skipping 158 matching lines @@
                                         int* left_margin,
                                         int* right_margin) const;
   // Returns true if the labels should reserve additional spacing for e.g.
   // submenu indicators at the end of the line.
   virtual bool ShouldReserveSpaceForSubmenuIndicator() const;
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_