Clean up NativeTheme (particularly CommonTheme).

ui/native_theme/native_theme_mac.mm

 // Copyright (c) 2013 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/native_theme/native_theme_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 114 matching lines @@
   return color;
 }
 
 SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
   // Even with --secondary-ui-md, menus use the platform colors and styling, and
   // Mac has a couple of specific color overrides, documented below.
   switch (color_id) {
     case kColorId_EnabledMenuItemForegroundColor:
       return NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_DisabledMenuItemForegroundColor:
-    case kColorId_DisabledEmphasizedMenuItemForegroundColor:
       return NSSystemColorToSkColor([NSColor disabledControlTextColor]);
     case kColorId_SelectedMenuItemForegroundColor:
       return NSSystemColorToSkColor([NSColor selectedMenuItemTextColor]);
     case kColorId_FocusedMenuItemBackgroundColor:
-    case kColorId_HoverMenuItemBackgroundColor:
       return NSSystemColorToSkColor([NSColor selectedMenuItemColor]);
     case kColorId_MenuBackgroundColor:
       return kMenuPopupBackgroundColor;
     case kColorId_MenuSeparatorColor:
       return base::mac::IsOS10_9() ? kMenuSeparatorColorMavericks
                                    : kMenuSeparatorColor;
     case kColorId_MenuBorderColor:
       return kMenuBorderColor;
 
     // Mac has a different "pressed button" styling because it doesn't use
@@ skipping 25 matching lines @@
       return SK_ColorWHITE;
 
     case kColorId_FocusedBorderColor:
       return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_FocusedMenuButtonBorderColor:
       return NSSystemColorToSkColor([NSColor keyboardFocusIndicatorColor]);
     case kColorId_UnfocusedBorderColor:
       return NSSystemColorToSkColor([NSColor controlColor]);
 
     // Buttons and labels.
-    case kColorId_ButtonBackgroundColor:
-    case kColorId_ButtonHoverBackgroundColor:
     case kColorId_HoverMenuButtonBorderColor:
-    case kColorId_LabelBackgroundColor:
       return NSSystemColorToSkColor([NSColor controlBackgroundColor]);
     case kColorId_ButtonEnabledColor:
     case kColorId_EnabledMenuButtonBorderColor:
     case kColorId_LabelEnabledColor:
     case kColorId_ProminentButtonColor:
       return NSSystemColorToSkColor([NSColor controlTextColor]);
     case kColorId_ButtonDisabledColor:
     case kColorId_LabelDisabledColor:
       return NSSystemColorToSkColor([NSColor disabledControlTextColor]);
-    case kColorId_ButtonHighlightColor:
-      // Although the NSColor documentation names "selectedControlTextColor" as
-      // the color for a "text in a .. control being clicked or dragged", it
-      // remains black, and text on Yosemite-style pressed buttons is white.
-      return SK_ColorWHITE;
     case kColorId_ButtonHoverColor:
       return NSSystemColorToSkColor([NSColor selectedControlTextColor]);
 
     // Link.
     case kColorId_LinkDisabled:
       return SK_ColorBLACK;
     case kColorId_LinkEnabled:
       return SK_ColorBLUE;
     case kColorId_LinkPressed:
       return SK_ColorRED;
@@ skipping 63 matching lines @@
   switch (state) {
     case NativeTheme::kNormal:
     case NativeTheme::kDisabled:
       // Draw nothing over the regular background.
       break;
     case NativeTheme::kHovered:
       // TODO(tapted): Draw a gradient, and use [NSColor currentControlTint] to
       // pick colors. The System color "selectedMenuItemColor" is actually still
       // blue for Graphite. And while "keyboardFocusIndicatorColor" does change,
       // and is a good shade of gray, it's not blue enough for the Blue theme.
-      paint.setColor(GetSystemColor(kColorId_HoverMenuItemBackgroundColor));
+      paint.setColor(GetSystemColor(kColorId_FocusedMenuItemBackgroundColor));
       canvas->drawRect(gfx::RectToSkRect(rect), paint);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 // static
 sk_sp<SkShader> NativeThemeMac::GetButtonBackgroundShader(
@@ skipping 138 matching lines @@
   canvas->drawDRRect(outer_shape, shape, paint);
 }
 
 NativeThemeMac::NativeThemeMac() {
 }
 
 NativeThemeMac::~NativeThemeMac() {
 }
 
 }  // namespace ui