Rename native theme color constants relating to text on dialog buttons

ui/native_theme/common_theme.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/native_theme/common_theme.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 121 matching lines @@
   static const SkColor kThrobberLightColor = SkColorSetRGB(0xF4, 0xF8, 0xFD);
 
   switch (color_id) {
     // Dialogs
     case NativeTheme::kColorId_WindowBackground:
     case NativeTheme::kColorId_DialogBackground:
     case NativeTheme::kColorId_BubbleBackground:
       return kDialogBackgroundColor;
 
     // Buttons
-    case NativeTheme::kColorId_ButtonEnabledColor:
+    case NativeTheme::kColorId_TextOnEnabledDialogButton:
     case NativeTheme::kColorId_ButtonHoverColor:
       return kButtonEnabledColor;
     // TODO(estade): remove the BlueButton colors.
     case NativeTheme::kColorId_BlueButtonEnabledColor:
     case NativeTheme::kColorId_BlueButtonDisabledColor:
     case NativeTheme::kColorId_BlueButtonPressedColor:
     case NativeTheme::kColorId_BlueButtonHoverColor:
       return kBlueButtonTextColor;
     case NativeTheme::kColorId_BlueButtonShadowColor:
       return kBlueButtonShadowColor;
     case NativeTheme::kColorId_ProminentButtonColor:
       return kProminentButtonColor;
-    case NativeTheme::kColorId_TextOnProminentButtonColor:
+    case NativeTheme::kColorId_TextOnProminentDialogButton:
       return kProminentButtonTextColor;
     case NativeTheme::kColorId_ButtonPressedShade:
       return SK_ColorTRANSPARENT;
-    case NativeTheme::kColorId_ButtonDisabledColor:
+    case NativeTheme::kColorId_TextOnDisabledDialogButton:
       return kDisabledMenuItemForegroundColor;
 
     // MenuItem
     case NativeTheme::kColorId_SelectedMenuItemForegroundColor:
       return kSelectedMenuItemForegroundColor;
     case NativeTheme::kColorId_MenuBorderColor:
       return kMenuBorderColor;
     case NativeTheme::kColorId_MenuSeparatorColor:
       return kMenuSeparatorColor;
     case NativeTheme::kColorId_MenuBackgroundColor:
       return kMenuBackgroundColor;
     case NativeTheme::kColorId_FocusedMenuItemBackgroundColor:
       return kMenuHighlightBackgroundColor;
     case NativeTheme::kColorId_EnabledMenuItemForegroundColor:
       return kEnabledMenuItemForegroundColor;
     case NativeTheme::kColorId_DisabledMenuItemForegroundColor:
       return kDisabledMenuItemForegroundColor;
     case NativeTheme::kColorId_MenuItemSubtitleColor:
       return base_theme->GetSystemColor(
           NativeTheme::kColorId_DisabledMenuItemForegroundColor);
 
     // Label
     case NativeTheme::kColorId_LabelEnabledColor:
       return kButtonEnabledColor;
     case NativeTheme::kColorId_LabelDisabledColor:
       return base_theme->GetSystemColor(
-          NativeTheme::kColorId_ButtonDisabledColor);
+          NativeTheme::kColorId_TextOnDisabledDialogButton);
     case NativeTheme::kColorId_LabelTextSelectionColor:
       return kTextSelectionColor;
     case NativeTheme::kColorId_LabelTextSelectionBackgroundFocused:
       return kTextSelectionBackgroundFocused;
 
     // Link
     // TODO(estade): where, if anywhere, do we use disabled links in Chrome?
     case NativeTheme::kColorId_LinkDisabled:
       return SK_ColorBLACK;
 
@@ skipping 150 matching lines @@
   }
   if (menu_item.corner_radius > 0) {
     const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
     canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, flags);
     return;
   }
   canvas->drawRect(gfx::RectToSkRect(rect), flags);
 }
 
 }  // namespace ui