| Index: ui/native_theme/common_theme.cc
|
| diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
|
| index 09216e0068e53b6723ab93c9ff51ba1495114cae..d038cfb5fa00b7726ddb5192a69a44ae345903bc 100644
|
| --- a/ui/native_theme/common_theme.cc
|
| +++ b/ui/native_theme/common_theme.cc
|
| @@ -139,7 +139,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
|
| return kDialogBackgroundColor;
|
|
|
| // Buttons
|
| - case NativeTheme::kColorId_ButtonEnabledColor:
|
| + case NativeTheme::kColorId_TextOnEnabledDialogButton:
|
| case NativeTheme::kColorId_ButtonHoverColor:
|
| return kButtonEnabledColor;
|
| // TODO(estade): remove the BlueButton colors.
|
| @@ -152,11 +152,11 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
|
| 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
|
| @@ -183,7 +183,7 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
|
| 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:
|
|
|