Chromium Code Reviews| Index: chrome/browser/ui/libgtkui/native_theme_gtk3.cc |
| diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc |
| index 6be1acba24f118af6a8b532f3fd978c7c21e601f..92624ac27bb297ef802c68222a88a5afa21f0e68 100644 |
| --- a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc |
| +++ b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc |
| @@ -101,7 +101,12 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) { |
| case ui::NativeTheme::kColorId_EnabledMenuButtonBorderColor: |
| case ui::NativeTheme::kColorId_FocusedMenuButtonBorderColor: |
| case ui::NativeTheme::kColorId_HoverMenuButtonBorderColor: |
| - return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem.separator:disabled"); |
| + if (gtk_get_major_version() > 3 || |
| + (gtk_get_major_version() == 3 && gtk_get_minor_version() >= 20)) { |
| + return GetBgColor("GtkMenu#menu GtkSeparator#separator"); |
| + } else { |
| + return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem.separator"); |
| + } |
| // Label |
| case ui::NativeTheme::kColorId_LabelEnabledColor: |
| @@ -137,7 +142,12 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) { |
| // Separator |
| case ui::NativeTheme::kColorId_SeparatorColor: |
| - return GetFgColor("GtkSeparator#separator.horizontal"); |
| + if (gtk_get_major_version() > 3 || |
| + (gtk_get_major_version() == 3 && gtk_get_minor_version() >= 20)) { |
|
Elliot Glaysher
2017/01/12 18:15:43
Separate this blob of version checks into its own
Tom (Use chromium acct)
2017/01/12 22:12:04
Done. Added GtkVersionCheck. I made it generic b
|
| + return GetBgColor("GtkSeparator#separator.horizontal"); |
| + } else { |
| + return GetFgColor("GtkSeparator#separator.horizontal"); |
| + } |
| // Button |
| case ui::NativeTheme::kColorId_ButtonEnabledColor: |