Commit 3277c65e authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Add missing constants to NativeThemeGtk

The constants kColorId_HighlightedMenuItem{Fore,Back}groundColor
are needed for the "Managed by google.com" menu entry and for
the "Sync and personalize Chrome across all your devices" promo.

While we're at it, add most of the missing constants.

R=pkasting
BUG=914974

Change-Id: I46dc623d14712d7bb859f13ede8efdd769b9772e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2073014
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744521}
parent d1841c6b
...@@ -101,6 +101,8 @@ base::Optional<SkColor> SkColorFromColorId( ...@@ -101,6 +101,8 @@ base::Optional<SkColor> SkColorFromColorId(
// Menu // Menu
case ui::NativeTheme::kColorId_MenuBackgroundColor: case ui::NativeTheme::kColorId_MenuBackgroundColor:
case ui::NativeTheme::kColorId_HighlightedMenuItemBackgroundColor:
case ui::NativeTheme::kColorId_MenuItemAlertBackgroundColor:
return GetBgColor("GtkMenu#menu"); return GetBgColor("GtkMenu#menu");
case ui::NativeTheme::kColorId_MenuBorderColor: case ui::NativeTheme::kColorId_MenuBorderColor:
return GetBorderColor("GtkMenu#menu"); return GetBorderColor("GtkMenu#menu");
...@@ -108,6 +110,7 @@ base::Optional<SkColor> SkColorFromColorId( ...@@ -108,6 +110,7 @@ base::Optional<SkColor> SkColorFromColorId(
return GetBgColor("GtkMenu#menu GtkMenuItem#menuitem:hover"); return GetBgColor("GtkMenu#menu GtkMenuItem#menuitem:hover");
case ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor: case ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor:
case ui::NativeTheme::kColorId_MenuDropIndicator: case ui::NativeTheme::kColorId_MenuDropIndicator:
case ui::NativeTheme::kColorId_HighlightedMenuItemForegroundColor:
return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem GtkLabel"); return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem GtkLabel");
case ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor: case ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor:
return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem:hover GtkLabel"); return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem:hover GtkLabel");
...@@ -222,6 +225,8 @@ base::Optional<SkColor> SkColorFromColorId( ...@@ -222,6 +225,8 @@ base::Optional<SkColor> SkColorFromColorId(
return GetFgColor("GtkButton#button.text-button:disabled GtkLabel"); return GetFgColor("GtkButton#button.text-button:disabled GtkLabel");
case ui::NativeTheme::kColorId_ButtonPressedShade: case ui::NativeTheme::kColorId_ButtonPressedShade:
return SK_ColorTRANSPARENT; return SK_ColorTRANSPARENT;
case ui::NativeTheme::kColorId_ButtonHoverColor:
return GetBgColor("GtkButton#button:hover");
// ProminentButton // ProminentButton
case ui::NativeTheme::kColorId_ProminentButtonColor: case ui::NativeTheme::kColorId_ProminentButtonColor:
...@@ -237,6 +242,16 @@ base::Optional<SkColor> SkColorFromColorId( ...@@ -237,6 +242,16 @@ base::Optional<SkColor> SkColorFromColorId(
return GetBgColor("GtkButton#button.text-button:disabled"); return GetBgColor("GtkButton#button.text-button:disabled");
case ui::NativeTheme::kColorId_ButtonBorderColor: case ui::NativeTheme::kColorId_ButtonBorderColor:
return GetBorderColor("GtkButton#button.text-button"); return GetBorderColor("GtkButton#button.text-button");
case ui::NativeTheme::kColorId_ProminentButtonHoverColor:
return GetBgColor(
"GtkTreeView#treeview.view "
"GtkTreeView#treeview.view.cell:selected:focus:hover");
// ToggleButton
case ui::NativeTheme::kColorId_ToggleButtonTrackColorOff:
return GetBgColor("GtkButton#button.text-button.toggle");
case ui::NativeTheme::kColorId_ToggleButtonTrackColorOn:
return GetBgColor("GtkButton#button.text-button.toggle:checked");
// TabbedPane // TabbedPane
case ui::NativeTheme::kColorId_TabTitleColorActive: case ui::NativeTheme::kColorId_TabTitleColorActive:
...@@ -353,6 +368,7 @@ base::Optional<SkColor> SkColorFromColorId( ...@@ -353,6 +368,7 @@ base::Optional<SkColor> SkColorFromColorId(
case ui::NativeTheme::kColorId_NumColors: case ui::NativeTheme::kColorId_NumColors:
NOTREACHED(); NOTREACHED();
break; break;
default: default:
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment