diff options
Diffstat (limited to 'ui/native_theme')
-rw-r--r-- | ui/native_theme/native_theme.h | 2 | ||||
-rw-r--r-- | ui/native_theme/native_theme_aura.cc | 10 | ||||
-rw-r--r-- | ui/native_theme/native_theme_win.cc | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h index 3ee74a2..021cf3c 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h @@ -218,6 +218,8 @@ class NATIVE_THEME_EXPORT NativeTheme { // Colors for GetSystemColor(). enum ColorId { + // Windows + kColorId_WindowBackground, // Dialogs kColorId_DialogBackground, // FocusableBorder diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc index 8cfdb31..01f61c5 100644 --- a/ui/native_theme/native_theme_aura.cc +++ b/ui/native_theme/native_theme_aura.cc @@ -20,8 +20,8 @@ const SkColor kMenuBackgroundColor = SK_ColorWHITE; // Theme colors returned by GetSystemColor(). const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128); -// Dialogs: -const SkColor kDialogBackgroundColor = SK_ColorWHITE; +// Windows: +const SkColor kWindowBackgroundColor = SK_ColorWHITE; // FocusableBorder: const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE); const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9); @@ -84,9 +84,13 @@ SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const { } switch (color_id) { + // Windows + case kColorId_WindowBackground: + return kWindowBackgroundColor; + // Dialogs case kColorId_DialogBackground: - return kDialogBackgroundColor; + return kWindowBackgroundColor; // FocusableBorder case kColorId_FocusedBorderColor: diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc index e4065a7..00636ff 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc @@ -450,6 +450,10 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const { } switch (color_id) { + // Windows + case kColorId_WindowBackground: + return system_colors_[COLOR_WINDOW]; + // Dialogs case kColorId_DialogBackground: // TODO(benrg): Should this use the new Windows theme functions? The old |