Clean up NativeTheme (particularly CommonTheme).

ui/views/controls/menu/menu_item_view.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 "ui/views/controls/menu/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 769 matching lines @@
   // Calculate some colors.
   ui::NativeTheme::ColorId color_id;
   if (enabled()) {
     color_id = render_selection ?
         ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor:
         ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor;
   } else {
     bool emphasized = delegate &&
                       delegate->GetShouldUseDisabledEmphasizedForegroundColor(
                           GetCommand());
-    color_id = emphasized ?
-        ui::NativeTheme::kColorId_DisabledEmphasizedMenuItemForegroundColor :
-        ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor;
+    color_id = emphasized
+                   ? ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor

[Evan Stade, 2016/09/30 18:02:36]

it really seems like this is just a special case where we want to have a
disabled menu item but have it use the normal text color (i.e. app menu >
history headers). It doesn't deserve its own native theme ID.

[tdanderson, 2016/09/30 21:00:56]

SG, but if you're changing this then consider also changing the name of
GetShouldUseDisabledEmphasizedForegroundColor() on 788 to something else.

Also, I'm assuming that by changing this it doesn't change the fact that the
text appears bolded?

[Evan Stade, 2016/09/30 22:19:00]

held my nose and changed it
no, it does not change the boldness

+                   : ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor;
   }
   SkColor fg_color = native_theme->GetSystemColor(color_id);
   SkColor override_foreground_color;
   if (delegate && delegate->GetForegroundColor(GetCommand(),
                                                render_selection,
                                                &override_foreground_color)) {
     fg_color = override_foreground_color;
   }
   SkColor icon_color =
       render_selection && !ui::MaterialDesignController::IsModeMaterial()
@@ skipping 278 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views