Chromium Code Reviews| Index: ui/native_theme/common_theme.cc |
| diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc |
| index 16808accaa1ceb00aac3092d9f6e6d6115001882..d7a29ed6bc55dd8eaba7b3777f02293ec920b278 100644 |
| --- a/ui/native_theme/common_theme.cc |
| +++ b/ui/native_theme/common_theme.cc |
| @@ -63,6 +63,12 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id, |
| // Normal and pressed share a color. |
| return kLinkEnabledColorMd; |
| + // FocusableBorder |
| + case NativeTheme::kColorId_FocusedBorderColor: |
| + return gfx::kGoogleBlue500; |
| + case NativeTheme::kColorId_UnfocusedBorderColor: |
| + return SkColorSetA(SK_ColorBLACK, 0x66); |
| + |
| // Results Tables |
| case NativeTheme::kColorId_ResultsTableHoveredBackground: |
| return SkColorSetA(base_theme->GetSystemColor( |
| @@ -101,19 +107,6 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id, |
| } |
| } |
| - if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { |
|
Evan Stade
2016/05/20 00:56:41
this change means that secondary ui surfaces which
|
| - switch (color_id) { |
| - // FocusableBorder |
| - case NativeTheme::kColorId_FocusedBorderColor: |
| - return gfx::kGoogleBlue500; |
| - case NativeTheme::kColorId_UnfocusedBorderColor: |
| - return SkColorSetA(SK_ColorBLACK, 0x66); |
| - |
| - default: |
| - break; |
| - } |
| - } |
| - |
| // Pre-MD colors. |
| // Windows: |
| static const SkColor kWindowBackgroundColor = SK_ColorWHITE; |