Skip to content

GitLab

T
tangled
Commit 7f1e4aed authored by Elaine Chien's avatar Elaine Chien Committed by Commit Bot
Browse files
Options

Unify ColorId names around kColorElementPartState[s] scheme 

Bug: 1057764
Change-Id: I0a585d6b98a0a6323a50220b16a90d004f2af24b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363306
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800301}
parent 331ae768
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 121 deletions
chrome/browser/ui/color/chrome_color_id.h
View file @ 7f1e4aed
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
ThemeProperties::COLOR_OMNIBOX_BUBBLE_OUTLINE) \ ThemeProperties::COLOR_OMNIBOX_BUBBLE_OUTLINE) \
E(kColorOmniboxBubbleOutlineExperimentalKeywordMode, \ E(kColorOmniboxBubbleOutlineExperimentalKeywordMode, \
ThemeProperties::COLOR_OMNIBOX_BUBBLE_OUTLINE_EXPERIMENTAL_KEYWORD_MODE) \ ThemeProperties::COLOR_OMNIBOX_BUBBLE_OUTLINE_EXPERIMENTAL_KEYWORD_MODE) \
E(kColorOmniboxKeywordSelected, \
ThemeProperties::COLOR_OMNIBOX_SELECTED_KEYWORD) \
E(kColorOmniboxResultsBackground, \ E(kColorOmniboxResultsBackground, \
ThemeProperties::COLOR_OMNIBOX_RESULTS_BG) \ ThemeProperties::COLOR_OMNIBOX_RESULTS_BG) \
E(kColorOmniboxResultsBackgroundHovered, \ E(kColorOmniboxResultsBackgroundHovered, \
...@@ -44,8 +46,6 @@ ...@@ -44,8 +46,6 @@
ThemeProperties::COLOR_OMNIBOX_SECURITY_CHIP_DEFAULT) \ ThemeProperties::COLOR_OMNIBOX_SECURITY_CHIP_DEFAULT) \
E(kColorOmniboxSecurityChipSecure, \ E(kColorOmniboxSecurityChipSecure, \
ThemeProperties::COLOR_OMNIBOX_SECURITY_CHIP_SECURE) \ ThemeProperties::COLOR_OMNIBOX_SECURITY_CHIP_SECURE) \
E(kColorOmniboxSelectedKeyword, \
ThemeProperties::COLOR_OMNIBOX_SELECTED_KEYWORD) \
E(kColorOmniboxText, ThemeProperties::COLOR_OMNIBOX_TEXT) \ E(kColorOmniboxText, ThemeProperties::COLOR_OMNIBOX_TEXT) \
E(kColorOmniboxTextDimmed, ThemeProperties::COLOR_OMNIBOX_TEXT_DIMMED) \ E(kColorOmniboxTextDimmed, ThemeProperties::COLOR_OMNIBOX_TEXT_DIMMED) \
\ \
......
chrome/browser/ui/color/omnibox_color_mixers.cc
View file @ 7f1e4aed
...@@ -32,7 +32,7 @@ void AddOmniboxColorMixers(ui::ColorProvider* provider, bool high_contrast) { ...@@ -32,7 +32,7 @@ void AddOmniboxColorMixers(ui::ColorProvider* provider, bool high_contrast) {
if (high_contrast) if (high_contrast)
selected_text += ui::ContrastInvert(ui::FromTransformInput()); selected_text += ui::ContrastInvert(ui::FromTransformInput());
} }
mixer[kColorOmniboxSelectedKeyword] = ui::SelectBasedOnDarkInput( mixer[kColorOmniboxKeywordSelected] = ui::SelectBasedOnDarkInput(
kColorOmniboxBackground, gfx::kGoogleGrey100, kColorOmniboxResultsUrl); kColorOmniboxBackground, gfx::kGoogleGrey100, kColorOmniboxResultsUrl);
// Bubble outline colors. // Bubble outline colors.
...@@ -40,7 +40,7 @@ void AddOmniboxColorMixers(ui::ColorProvider* provider, bool high_contrast) { ...@@ -40,7 +40,7 @@ void AddOmniboxColorMixers(ui::ColorProvider* provider, bool high_contrast) {
ui::SelectBasedOnDarkInput(kColorOmniboxBackground, gfx::kGoogleGrey100, ui::SelectBasedOnDarkInput(kColorOmniboxBackground, gfx::kGoogleGrey100,
SkColorSetA(gfx::kGoogleGrey900, 0x24)); SkColorSetA(gfx::kGoogleGrey900, 0x24));
mixer[kColorOmniboxBubbleOutlineExperimentalKeywordMode] = { mixer[kColorOmniboxBubbleOutlineExperimentalKeywordMode] = {
kColorOmniboxSelectedKeyword}; kColorOmniboxKeywordSelected};
// Results background colors. // Results background colors.
mixer[kColorOmniboxResultsBackground] = mixer[kColorOmniboxResultsBackground] =
......
ui/color/color_id.h
View file @ 7f1e4aed
...@@ -30,90 +30,90 @@ ...@@ -30,90 +30,90 @@
E(kColorBubbleFooterBackground, \ E(kColorBubbleFooterBackground, \
NativeTheme::kColorId_BubbleFooterBackground) \ NativeTheme::kColorId_BubbleFooterBackground) \
E(kColorButtonBackground, NativeTheme::kColorId_ButtonColor) \ E(kColorButtonBackground, NativeTheme::kColorId_ButtonColor) \
E(kColorButtonBorder, NativeTheme::kColorId_ButtonBorderColor) \
E(kColorButtonDisabledBorder, \
NativeTheme::kColorId_DisabledButtonBorderColor) \
E(kColorButtonDisabledForeground, NativeTheme::kColorId_ButtonDisabledColor) \
E(kColorButtonForeground, NativeTheme::kColorId_ButtonEnabledColor) \
/* TODO(https://crbug.com/1003612): Map this to old color id. */ \ /* TODO(https://crbug.com/1003612): Map this to old color id. */ \
E_CPONLY(kColorButtonPressedBackground) \ E_CPONLY(kColorButtonBackgroundPressed) \
E(kColorButtonProminentBackground, \ E(kColorButtonBackgroundProminent, \
NativeTheme::kColorId_ProminentButtonColor) \ NativeTheme::kColorId_ProminentButtonColor) \
E(kColorButtonProminentDisabledBackground, \ E(kColorButtonBackgroundProminentDisabled, \
NativeTheme::kColorId_ProminentButtonDisabledColor) \ NativeTheme::kColorId_ProminentButtonDisabledColor) \
E(kColorButtonProminentFocusedBackground, \ E(kColorButtonBackgroundProminentFocused, \
NativeTheme::kColorId_ProminentButtonFocusedColor) \ NativeTheme::kColorId_ProminentButtonFocusedColor) \
E(kColorButtonProminentForeground, \ E(kColorButtonBorder, NativeTheme::kColorId_ButtonBorderColor) \
E(kColorButtonBorderDisabled, \
NativeTheme::kColorId_DisabledButtonBorderColor) \
E(kColorButtonForeground, NativeTheme::kColorId_ButtonEnabledColor) \
E(kColorButtonForegroundDisabled, NativeTheme::kColorId_ButtonDisabledColor) \
E(kColorButtonForegroundProminent, \
NativeTheme::kColorId_TextOnProminentButtonColor) \ NativeTheme::kColorId_TextOnProminentButtonColor) \
E(kColorButtonUncheckedForeground, \ E(kColorButtonForegroundUnchecked, \
NativeTheme::kColorId_ButtonUncheckedColor) \ NativeTheme::kColorId_ButtonUncheckedColor) \
E(kColorDialogBackground, NativeTheme::kColorId_DialogBackground) \ E(kColorDialogBackground, NativeTheme::kColorId_DialogBackground) \
E(kColorDialogForeground, NativeTheme::kColorId_DialogForeground) \ E(kColorDialogForeground, NativeTheme::kColorId_DialogForeground) \
E(kColorFocusableBorderFocused, NativeTheme::kColorId_FocusedBorderColor) \ E(kColorFocusableBorderFocused, NativeTheme::kColorId_FocusedBorderColor) \
E(kColorFocusableBorderUnfocused, \ E(kColorFocusableBorderUnfocused, \
NativeTheme::kColorId_UnfocusedBorderColor) \ NativeTheme::kColorId_UnfocusedBorderColor) \
E(kColorMenuIcon, NativeTheme::kColorId_MenuIconColor) \
E(kColorIcon, NativeTheme::kColorId_DefaultIconColor) \ E(kColorIcon, NativeTheme::kColorId_DefaultIconColor) \
E(kColorLabelDisabledForeground, NativeTheme::kColorId_LabelDisabledColor) \
E(kColorLabelForeground, NativeTheme::kColorId_LabelEnabledColor) \ E(kColorLabelForeground, NativeTheme::kColorId_LabelEnabledColor) \
E(kColorLabelSecondaryForeground, NativeTheme::kColorId_LabelSecondaryColor) \ E(kColorLabelForegroundDisabled, NativeTheme::kColorId_LabelDisabledColor) \
E(kColorLabelForegroundSecondary, NativeTheme::kColorId_LabelSecondaryColor) \
E(kColorLabelSelectionBackground, \ E(kColorLabelSelectionBackground, \
NativeTheme::kColorId_LabelTextSelectionBackgroundFocused) \ NativeTheme::kColorId_LabelTextSelectionBackgroundFocused) \
E(kColorLabelSelectionForeground, \ E(kColorLabelSelectionForeground, \
NativeTheme::kColorId_LabelTextSelectionColor) \ NativeTheme::kColorId_LabelTextSelectionColor) \
E(kColorLinkDisabledForeground, NativeTheme::kColorId_LinkDisabled) \
E(kColorLinkForeground, NativeTheme::kColorId_LinkEnabled) \ E(kColorLinkForeground, NativeTheme::kColorId_LinkEnabled) \
E(kColorLinkPressedForeground, NativeTheme::kColorId_LinkPressed) \ E(kColorLinkForegroundDisabled, NativeTheme::kColorId_LinkDisabled) \
E(kColorLinkForegroundPressed, NativeTheme::kColorId_LinkPressed) \
E(kColorMenuBackground, NativeTheme::kColorId_MenuBackgroundColor) \ E(kColorMenuBackground, NativeTheme::kColorId_MenuBackgroundColor) \
E(kColorMenuBorder, NativeTheme::kColorId_MenuBorderColor) \ E(kColorMenuBorder, NativeTheme::kColorId_MenuBorderColor) \
E(kColorMenuIcon, NativeTheme::kColorId_MenuIconColor) \
E(kColorMenuItemBackgroundAlertedInitial, \ E(kColorMenuItemBackgroundAlertedInitial, \
NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor) \ NativeTheme::kColorId_MenuItemInitialAlertBackgroundColor) \
E(kColorMenuItemBackgroundAlertedTarget, \ E(kColorMenuItemBackgroundAlertedTarget, \
NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor) \ NativeTheme::kColorId_MenuItemTargetAlertBackgroundColor) \
E(kColorMenuItemDisabledForeground, \ E(kColorMenuItemBackgroundHighlighted, \
NativeTheme::kColorId_DisabledMenuItemForegroundColor) \ NativeTheme::kColorId_HighlightedMenuItemBackgroundColor) \
E(kColorMenuItemBackgroundSelected, \
NativeTheme::kColorId_FocusedMenuItemBackgroundColor) \
E(kColorMenuItemForeground, \ E(kColorMenuItemForeground, \
NativeTheme::kColorId_EnabledMenuItemForegroundColor) \ NativeTheme::kColorId_EnabledMenuItemForegroundColor) \
E(kColorMenuItemHighlightedBackground, \ E(kColorMenuItemForegroundDisabled, \
NativeTheme::kColorId_HighlightedMenuItemBackgroundColor) \ NativeTheme::kColorId_DisabledMenuItemForegroundColor) \
E(kColorMenuItemHighlightedForeground, \ E(kColorMenuItemForegroundHighlighted, \
NativeTheme::kColorId_HighlightedMenuItemForegroundColor) \ NativeTheme::kColorId_HighlightedMenuItemForegroundColor) \
E(kColorMenuItemSecondaryForeground, \ E(kColorMenuItemForegroundSecondary, \
NativeTheme::kColorId_MenuItemMinorTextColor) \ NativeTheme::kColorId_MenuItemMinorTextColor) \
E(kColorMenuItemSelectedBackground, \ E(kColorMenuItemForegroundSelected, \
NativeTheme::kColorId_FocusedMenuItemBackgroundColor) \
E(kColorMenuItemSelectedForeground, \
NativeTheme::kColorId_SelectedMenuItemForegroundColor) \ NativeTheme::kColorId_SelectedMenuItemForegroundColor) \
E(kColorMenuSeparator, NativeTheme::kColorId_MenuSeparatorColor) \ E(kColorMenuSeparator, NativeTheme::kColorId_MenuSeparatorColor) \
E(kColorTabBorderSelected, NativeTheme::kColorId_TabSelectedBorderColor) \
E(kColorTabContentSeparator, NativeTheme::kColorId_TabBottomBorder) \ E(kColorTabContentSeparator, NativeTheme::kColorId_TabBottomBorder) \
E(kColorTabForeground, NativeTheme::kColorId_TabTitleColorInactive) \ E(kColorTabForeground, NativeTheme::kColorId_TabTitleColorInactive) \
E(kColorTabSelectedBorder, NativeTheme::kColorId_TabSelectedBorderColor) \ E(kColorTabForegroundSelected, \
E(kColorTabSelectedForeground, \
NativeTheme::kColorId_TabTitleColorActive) \ NativeTheme::kColorId_TabTitleColorActive) \
E(kColorTableBackground, NativeTheme::kColorId_TableBackground) \ E(kColorTableBackground, NativeTheme::kColorId_TableBackground) \
E(kColorTableBackgroundSelectedFocused, \
NativeTheme::kColorId_TableSelectionBackgroundFocused) \
E(kColorTableBackgroundSelectedUnfocused, \
NativeTheme::kColorId_TableSelectionBackgroundUnfocused) \
E(kColorTableForeground, NativeTheme::kColorId_TableText) \ E(kColorTableForeground, NativeTheme::kColorId_TableText) \
E(kColorTableForegroundSelectedFocused, \
NativeTheme::kColorId_TableSelectedText) \
E(kColorTableForegroundSelectedUnfocused, \
NativeTheme::kColorId_TableSelectedTextUnfocused) \
E(kColorTableGroupingIndicator, \ E(kColorTableGroupingIndicator, \
NativeTheme::kColorId_TableGroupingIndicatorColor) \ NativeTheme::kColorId_TableGroupingIndicatorColor) \
E(kColorTableHeaderBackground, NativeTheme::kColorId_TableHeaderBackground) \ E(kColorTableHeaderBackground, NativeTheme::kColorId_TableHeaderBackground) \
E(kColorTableHeaderForeground, NativeTheme::kColorId_TableHeaderText) \ E(kColorTableHeaderForeground, NativeTheme::kColorId_TableHeaderText) \
E(kColorTableHeaderSeparator, NativeTheme::kColorId_TableHeaderSeparator) \ E(kColorTableHeaderSeparator, NativeTheme::kColorId_TableHeaderSeparator) \
E(kColorTableSelectedFocusedBackground, \
NativeTheme::kColorId_TableSelectionBackgroundFocused) \
E(kColorTableSelectedFocusedForeground, \
NativeTheme::kColorId_TableSelectedText) \
E(kColorTableSelectedUnfocusedBackground, \
NativeTheme::kColorId_TableSelectionBackgroundUnfocused) \
E(kColorTableSelectedUnfocusedForeground, \
NativeTheme::kColorId_TableSelectedTextUnfocused) \
E(kColorTextfieldBackground, \ E(kColorTextfieldBackground, \
NativeTheme::kColorId_TextfieldDefaultBackground) \ NativeTheme::kColorId_TextfieldDefaultBackground) \
E(kColorTextfieldDisabledBackground, \ E(kColorTextfieldBackgroundDisabled, \
NativeTheme::kColorId_TextfieldReadOnlyBackground) \ NativeTheme::kColorId_TextfieldReadOnlyBackground) \
E(kColorTextfieldDisabledForeground, \ E(kColorTextfieldForeground, NativeTheme::kColorId_TextfieldDefaultColor) \
E(kColorTextfieldForegroundDisabled, \
NativeTheme::kColorId_TextfieldReadOnlyColor) \ NativeTheme::kColorId_TextfieldReadOnlyColor) \
E(kColorTextfieldPlaceholderForeground, \ E(kColorTextfieldForegroundPlaceholder, \
NativeTheme::kColorId_TextfieldPlaceholderColor) \ NativeTheme::kColorId_TextfieldPlaceholderColor) \
E(kColorTextfieldForeground, NativeTheme::kColorId_TextfieldDefaultColor) \
E(kColorTextfieldSelectionBackground, \ E(kColorTextfieldSelectionBackground, \
NativeTheme::kColorId_TextfieldSelectionBackgroundFocused) \ NativeTheme::kColorId_TextfieldSelectionBackgroundFocused) \
E(kColorTextfieldSelectionForeground, \ E(kColorTextfieldSelectionForeground, \
...@@ -122,14 +122,14 @@ ...@@ -122,14 +122,14 @@
E(kColorTooltipBackground, NativeTheme::kColorId_TooltipBackground) \ E(kColorTooltipBackground, NativeTheme::kColorId_TooltipBackground) \
E(kColorTooltipForeground, NativeTheme::kColorId_TooltipText) \ E(kColorTooltipForeground, NativeTheme::kColorId_TooltipText) \
E(kColorTreeBackground, NativeTheme::kColorId_TreeBackground) \ E(kColorTreeBackground, NativeTheme::kColorId_TreeBackground) \
E(kColorTreeNodeForeground, NativeTheme::kColorId_TreeText) \ E(kColorTreeNodeBackgroundSelectedFocused, \
E(kColorTreeNodeSelectedFocusedBackground, \
NativeTheme::kColorId_TreeSelectionBackgroundFocused) \ NativeTheme::kColorId_TreeSelectionBackgroundFocused) \
E(kColorTreeNodeSelectedFocusedForeground, \ E(kColorTreeNodeBackgroundSelectedUnfocused, \
NativeTheme::kColorId_TreeSelectedText) \
E(kColorTreeNodeSelectedUnfocusedBackground, \
NativeTheme::kColorId_TreeSelectionBackgroundUnfocused) \ NativeTheme::kColorId_TreeSelectionBackgroundUnfocused) \
E(kColorTreeNodeSelectedUnfocusedForeground, \ E(kColorTreeNodeForeground, NativeTheme::kColorId_TreeText) \
E(kColorTreeNodeForegroundSelectedFocused, \
NativeTheme::kColorId_TreeSelectedText) \
E(kColorTreeNodeForegroundSelectedUnfocused, \
NativeTheme::kColorId_TreeSelectedTextUnfocused) \ NativeTheme::kColorId_TreeSelectedTextUnfocused) \
E(kColorWindowBackground, NativeTheme::kColorId_WindowBackground) E(kColorWindowBackground, NativeTheme::kColorId_WindowBackground)
......
ui/color/mac/native_color_mixers.mm
View file @ 7f1e4aed
...@@ -37,7 +37,7 @@ void AddNativeUiColorMixer(ColorProvider* provider, bool dark_window) { ...@@ -37,7 +37,7 @@ void AddNativeUiColorMixer(ColorProvider* provider, bool dark_window) {
[NSColor keyboardFocusIndicatorColor]), [NSColor keyboardFocusIndicatorColor]),
0x66)}, 0x66)},
{kColorMenuBorder, SkColorSetA(SK_ColorBLACK, 0x60)}, {kColorMenuBorder, SkColorSetA(SK_ColorBLACK, 0x60)},
{kColorMenuItemDisabledForeground, {kColorMenuItemForegroundDisabled,
skia::NSSystemColorToSkColor([NSColor disabledControlTextColor])}, skia::NSSystemColorToSkColor([NSColor disabledControlTextColor])},
{kColorMenuItemForeground, {kColorMenuItemForeground,
skia::NSSystemColorToSkColor([NSColor controlTextColor])}, skia::NSSystemColorToSkColor([NSColor controlTextColor])},
...@@ -46,8 +46,8 @@ void AddNativeUiColorMixer(ColorProvider* provider, bool dark_window) { ...@@ -46,8 +46,8 @@ void AddNativeUiColorMixer(ColorProvider* provider, bool dark_window) {
[NSColor selectedTextBackgroundColor])}, [NSColor selectedTextBackgroundColor])},
}}); }});
mixer[kColorMenuItemHighlightedForeground] = {kColorPrimaryForeground}; mixer[kColorMenuItemForegroundHighlighted] = {kColorPrimaryForeground};
mixer[kColorMenuItemSelectedForeground] = {kColorPrimaryForeground}; mixer[kColorMenuItemForegroundSelected] = {kColorPrimaryForeground};
if (@available(macOS 10.14, *)) { if (@available(macOS 10.14, *)) {
mixer[kColorTableBackgroundAlternate] = {skia::NSSystemColorToSkColor( mixer[kColorTableBackgroundAlternate] = {skia::NSSystemColorToSkColor(
......
ui/color/ui_color_mixer.cc
View file @ 7f1e4aed
...@@ -21,65 +21,65 @@ void AddUiColorMixer(ColorProvider* provider) { ...@@ -21,65 +21,65 @@ void AddUiColorMixer(ColorProvider* provider) {
mixer[kColorBubbleFooterBackground] = {kColorSubtleEmphasisBackground}; mixer[kColorBubbleFooterBackground] = {kColorSubtleEmphasisBackground};
mixer[kColorButtonBackground] = {kColorPrimaryBackground}; mixer[kColorButtonBackground] = {kColorPrimaryBackground};
mixer[kColorButtonBorder] = {kColorBorderAndSeparatorForeground}; mixer[kColorButtonBorder] = {kColorBorderAndSeparatorForeground};
mixer[kColorButtonDisabledBorder] = button_disabled_background; mixer[kColorButtonBorderDisabled] = button_disabled_background;
mixer[kColorButtonDisabledForeground] = {kColorDisabledForeground}; mixer[kColorButtonForegroundDisabled] = {kColorDisabledForeground};
mixer[kColorButtonForeground] = {kColorAccent}; mixer[kColorButtonForeground] = {kColorAccent};
mixer[kColorButtonPressedBackground] = {kColorButtonBackground}; mixer[kColorButtonBackgroundPressed] = {kColorButtonBackground};
mixer[kColorButtonProminentBackground] = {kColorAccent}; mixer[kColorButtonBackgroundProminent] = {kColorAccent};
mixer[kColorButtonProminentDisabledBackground] = button_disabled_background; mixer[kColorButtonBackgroundProminentDisabled] = button_disabled_background;
mixer[kColorButtonProminentFocusedBackground] = mixer[kColorButtonBackgroundProminentFocused] =
BlendForMinContrastWithSelf(kColorButtonProminentBackground, 1.3f); BlendForMinContrastWithSelf(kColorButtonBackgroundProminent, 1.3f);
mixer[kColorButtonProminentForeground] = mixer[kColorButtonForegroundProminent] =
GetColorWithMaxContrast(kColorButtonProminentBackground); GetColorWithMaxContrast(kColorButtonBackgroundProminent);
mixer[kColorButtonUncheckedForeground] = {kColorSecondaryForeground}; mixer[kColorButtonForegroundUnchecked] = {kColorSecondaryForeground};
mixer[kColorDialogBackground] = {kColorPrimaryBackground}; mixer[kColorDialogBackground] = {kColorPrimaryBackground};
mixer[kColorDialogForeground] = {kColorSecondaryForeground}; mixer[kColorDialogForeground] = {kColorSecondaryForeground};
mixer[kColorFocusableBorderFocused] = SetAlpha(kColorAccent, 0x4D); mixer[kColorFocusableBorderFocused] = SetAlpha(kColorAccent, 0x4D);
mixer[kColorFocusableBorderUnfocused] = {kColorBorderAndSeparatorForeground}; mixer[kColorFocusableBorderUnfocused] = {kColorBorderAndSeparatorForeground};
mixer[kColorIcon] = {kColorSecondaryForeground}; mixer[kColorIcon] = {kColorSecondaryForeground};
mixer[kColorMenuIcon] = {kColorIcon}; mixer[kColorMenuIcon] = {kColorIcon};
mixer[kColorLabelDisabledForeground] = {kColorDisabledForeground}; mixer[kColorLabelForegroundDisabled] = {kColorDisabledForeground};
mixer[kColorLabelForeground] = {kColorPrimaryForeground}; mixer[kColorLabelForeground] = {kColorPrimaryForeground};
mixer[kColorLabelSecondaryForeground] = {kColorSecondaryForeground}; mixer[kColorLabelForegroundSecondary] = {kColorSecondaryForeground};
mixer[kColorLabelSelectionBackground] = {kColorTextSelectionBackground}; mixer[kColorLabelSelectionBackground] = {kColorTextSelectionBackground};
mixer[kColorLabelSelectionForeground] = {kColorLabelForeground}; mixer[kColorLabelSelectionForeground] = {kColorLabelForeground};
mixer[kColorLinkDisabledForeground] = {kColorDisabledForeground}; mixer[kColorLinkForegroundDisabled] = {kColorDisabledForeground};
mixer[kColorLinkPressedForeground] = {kColorLinkForeground}; mixer[kColorLinkForegroundPressed] = {kColorLinkForeground};
mixer[kColorLinkForeground] = {kColorAccent}; mixer[kColorLinkForeground] = {kColorAccent};
mixer[kColorMenuBackground] = {kColorPrimaryBackground}; mixer[kColorMenuBackground] = {kColorPrimaryBackground};
mixer[kColorMenuBorder] = {kColorBorderAndSeparatorForeground}; mixer[kColorMenuBorder] = {kColorBorderAndSeparatorForeground};
mixer[kColorMenuItemBackgroundAlertedInitial] = SetAlpha(kColorAccent, 0x4D); mixer[kColorMenuItemBackgroundAlertedInitial] = SetAlpha(kColorAccent, 0x4D);
mixer[kColorMenuItemBackgroundAlertedTarget] = SetAlpha(kColorAccent, 0x1A); mixer[kColorMenuItemBackgroundAlertedTarget] = SetAlpha(kColorAccent, 0x1A);
mixer[kColorMenuItemDisabledForeground] = {kColorDisabledForeground}; mixer[kColorMenuItemForegroundDisabled] = {kColorDisabledForeground};
mixer[kColorMenuItemForeground] = {kColorPrimaryForeground}; mixer[kColorMenuItemForeground] = {kColorPrimaryForeground};
mixer[kColorMenuItemHighlightedBackground] = {kColorSubtleEmphasisBackground}; mixer[kColorMenuItemBackgroundHighlighted] = {kColorSubtleEmphasisBackground};
mixer[kColorMenuItemHighlightedForeground] = {kColorMenuItemForeground}; mixer[kColorMenuItemForegroundHighlighted] = {kColorMenuItemForeground};
mixer[kColorMenuItemSecondaryForeground] = {kColorSecondaryForeground}; mixer[kColorMenuItemForegroundSecondary] = {kColorSecondaryForeground};
mixer[kColorMenuItemSelectedBackground] = {kColorItemSelectionBackground}; mixer[kColorMenuItemBackgroundSelected] = {kColorItemSelectionBackground};
mixer[kColorMenuItemSelectedForeground] = {kColorMenuItemForeground}; mixer[kColorMenuItemForegroundSelected] = {kColorMenuItemForeground};
mixer[kColorMenuSeparator] = {kColorBorderAndSeparatorForeground}; mixer[kColorMenuSeparator] = {kColorBorderAndSeparatorForeground};
mixer[kColorTabContentSeparator] = {kColorBorderAndSeparatorForeground}; mixer[kColorTabContentSeparator] = {kColorBorderAndSeparatorForeground};
mixer[kColorTabForeground] = {kColorSecondaryForeground}; mixer[kColorTabForeground] = {kColorSecondaryForeground};
mixer[kColorTabSelectedBorder] = {kColorAccent}; mixer[kColorTabBorderSelected] = {kColorAccent};
mixer[kColorTabSelectedForeground] = {kColorAccent}; mixer[kColorTabForegroundSelected] = {kColorAccent};
mixer[kColorTableBackground] = {kColorPrimaryBackground}; mixer[kColorTableBackground] = {kColorPrimaryBackground};
mixer[kColorTableForeground] = {kColorPrimaryForeground}; mixer[kColorTableForeground] = {kColorPrimaryForeground};
mixer[kColorTableGroupingIndicator] = {kColorTableSelectedFocusedBackground}; mixer[kColorTableGroupingIndicator] = {kColorTableBackgroundSelectedFocused};
mixer[kColorTableHeaderBackground] = {kColorTableBackground}; mixer[kColorTableHeaderBackground] = {kColorTableBackground};
mixer[kColorTableHeaderForeground] = {kColorTableForeground}; mixer[kColorTableHeaderForeground] = {kColorTableForeground};
mixer[kColorTableHeaderSeparator] = {kColorBorderAndSeparatorForeground}; mixer[kColorTableHeaderSeparator] = {kColorBorderAndSeparatorForeground};
mixer[kColorTableSelectedFocusedBackground] = {kColorItemSelectionBackground}; mixer[kColorTableBackgroundSelectedFocused] = {kColorItemSelectionBackground};
mixer[kColorTableSelectedFocusedForeground] = {kColorTableForeground}; mixer[kColorTableForegroundSelectedFocused] = {kColorTableForeground};
mixer[kColorTableSelectedUnfocusedBackground] = { mixer[kColorTableBackgroundSelectedUnfocused] = {
kColorTableSelectedFocusedBackground}; kColorTableBackgroundSelectedFocused};
mixer[kColorTableSelectedUnfocusedForeground] = { mixer[kColorTableForegroundSelectedUnfocused] = {
kColorTableSelectedFocusedForeground}; kColorTableForegroundSelectedFocused};
mixer[kColorTextfieldBackground] = mixer[kColorTextfieldBackground] =
GetColorWithMaxContrast(kColorTextfieldForeground); GetColorWithMaxContrast(kColorTextfieldForeground);
mixer[kColorTextfieldDisabledBackground] = {kColorPrimaryBackground}; mixer[kColorTextfieldBackgroundDisabled] = {kColorPrimaryBackground};
mixer[kColorTextfieldDisabledForeground] = {kColorDisabledForeground}; mixer[kColorTextfieldForegroundDisabled] = {kColorDisabledForeground};
mixer[kColorTextfieldPlaceholderForeground] = { mixer[kColorTextfieldForegroundPlaceholder] = {
kColorTextfieldDisabledForeground}; kColorTextfieldForegroundDisabled};
mixer[kColorTextfieldForeground] = {kColorPrimaryForeground}; mixer[kColorTextfieldForeground] = {kColorPrimaryForeground};
mixer[kColorTextfieldSelectionBackground] = {kColorTextSelectionBackground}; mixer[kColorTextfieldSelectionBackground] = {kColorTextSelectionBackground};
mixer[kColorTextfieldSelectionForeground] = {kColorTextfieldForeground}; mixer[kColorTextfieldSelectionForeground] = {kColorTextfieldForeground};
...@@ -88,13 +88,13 @@ void AddUiColorMixer(ColorProvider* provider) { ...@@ -88,13 +88,13 @@ void AddUiColorMixer(ColorProvider* provider) {
mixer[kColorTooltipForeground] = SetAlpha(kColorPrimaryForeground, 0xDE); mixer[kColorTooltipForeground] = SetAlpha(kColorPrimaryForeground, 0xDE);
mixer[kColorTreeBackground] = {kColorPrimaryBackground}; mixer[kColorTreeBackground] = {kColorPrimaryBackground};
mixer[kColorTreeNodeForeground] = {kColorPrimaryForeground}; mixer[kColorTreeNodeForeground] = {kColorPrimaryForeground};
mixer[kColorTreeNodeSelectedFocusedBackground] = { mixer[kColorTreeNodeBackgroundSelectedFocused] = {
kColorItemSelectionBackground}; kColorItemSelectionBackground};
mixer[kColorTreeNodeSelectedFocusedForeground] = {kColorTreeNodeForeground}; mixer[kColorTreeNodeForegroundSelectedFocused] = {kColorTreeNodeForeground};
mixer[kColorTreeNodeSelectedUnfocusedBackground] = { mixer[kColorTreeNodeBackgroundSelectedUnfocused] = {
kColorTreeNodeSelectedFocusedBackground}; kColorTreeNodeBackgroundSelectedFocused};
mixer[kColorTreeNodeSelectedUnfocusedForeground] = { mixer[kColorTreeNodeForegroundSelectedUnfocused] = {
kColorTreeNodeSelectedFocusedForeground}; kColorTreeNodeForegroundSelectedFocused};
mixer[kColorWindowBackground] = {kColorPrimaryBackground}; mixer[kColorWindowBackground] = {kColorPrimaryBackground};
} }
......
ui/native_theme/native_theme.cc
View file @ 7f1e4aed
...@@ -41,20 +41,20 @@ NativeThemeColorIdToColorIdMap() { ...@@ -41,20 +41,20 @@ NativeThemeColorIdToColorIdMap() {
kColorBubbleFooterBackground}, kColorBubbleFooterBackground},
{NTCID::kColorId_ButtonColor, kColorButtonBackground}, {NTCID::kColorId_ButtonColor, kColorButtonBackground},
{NTCID::kColorId_ButtonBorderColor, kColorButtonBorder}, {NTCID::kColorId_ButtonBorderColor, kColorButtonBorder},
{NTCID::kColorId_DisabledButtonBorderColor, kColorButtonDisabledBorder}, {NTCID::kColorId_DisabledButtonBorderColor, kColorButtonBorderDisabled},
{NTCID::kColorId_ButtonDisabledColor, {NTCID::kColorId_ButtonDisabledColor,
kColorButtonDisabledForeground}, kColorButtonForegroundDisabled},
{NTCID::kColorId_ButtonEnabledColor, kColorButtonForeground}, {NTCID::kColorId_ButtonEnabledColor, kColorButtonForeground},
{NTCID::kColorId_ProminentButtonColor, {NTCID::kColorId_ProminentButtonColor,
kColorButtonProminentBackground}, kColorButtonBackgroundProminent},
{NTCID::kColorId_ProminentButtonDisabledColor, {NTCID::kColorId_ProminentButtonDisabledColor,
kColorButtonProminentDisabledBackground}, kColorButtonBackgroundProminentDisabled},
{NTCID::kColorId_ProminentButtonFocusedColor, {NTCID::kColorId_ProminentButtonFocusedColor,
kColorButtonProminentFocusedBackground}, kColorButtonBackgroundProminentFocused},
{NTCID::kColorId_TextOnProminentButtonColor, {NTCID::kColorId_TextOnProminentButtonColor,
kColorButtonProminentForeground}, kColorButtonForegroundProminent},
{NTCID::kColorId_ButtonUncheckedColor, {NTCID::kColorId_ButtonUncheckedColor,
kColorButtonUncheckedForeground}, kColorButtonForegroundUnchecked},
{NTCID::kColorId_DialogBackground, kColorDialogBackground}, {NTCID::kColorId_DialogBackground, kColorDialogBackground},
{NTCID::kColorId_DialogForeground, kColorDialogForeground}, {NTCID::kColorId_DialogForeground, kColorDialogForeground},
{NTCID::kColorId_FocusedBorderColor, kColorFocusableBorderFocused}, {NTCID::kColorId_FocusedBorderColor, kColorFocusableBorderFocused},
...@@ -62,17 +62,17 @@ NativeThemeColorIdToColorIdMap() { ...@@ -62,17 +62,17 @@ NativeThemeColorIdToColorIdMap() {
kColorFocusableBorderUnfocused}, kColorFocusableBorderUnfocused},
{NTCID::kColorId_MenuIconColor, kColorMenuIcon}, {NTCID::kColorId_MenuIconColor, kColorMenuIcon},
{NTCID::kColorId_DefaultIconColor, kColorIcon}, {NTCID::kColorId_DefaultIconColor, kColorIcon},
{NTCID::kColorId_LabelDisabledColor, kColorLabelDisabledForeground}, {NTCID::kColorId_LabelDisabledColor, kColorLabelForegroundDisabled},
{NTCID::kColorId_LabelEnabledColor, kColorLabelForeground}, {NTCID::kColorId_LabelEnabledColor, kColorLabelForeground},
{NTCID::kColorId_LabelSecondaryColor, {NTCID::kColorId_LabelSecondaryColor,
kColorLabelSecondaryForeground}, kColorLabelForegroundSecondary},
{NTCID::kColorId_LabelTextSelectionBackgroundFocused, {NTCID::kColorId_LabelTextSelectionBackgroundFocused,
kColorLabelSelectionBackground}, kColorLabelSelectionBackground},
{NTCID::kColorId_LabelTextSelectionColor, {NTCID::kColorId_LabelTextSelectionColor,
kColorLabelSelectionForeground}, kColorLabelSelectionForeground},
{NTCID::kColorId_LinkDisabled, kColorLinkDisabledForeground}, {NTCID::kColorId_LinkDisabled, kColorLinkForegroundDisabled},
{NTCID::kColorId_LinkEnabled, kColorLinkForeground}, {NTCID::kColorId_LinkEnabled, kColorLinkForeground},
{NTCID::kColorId_LinkPressed, kColorLinkPressedForeground}, {NTCID::kColorId_LinkPressed, kColorLinkForegroundPressed},
{NTCID::kColorId_MenuBackgroundColor, kColorMenuBackground}, {NTCID::kColorId_MenuBackgroundColor, kColorMenuBackground},
{NTCID::kColorId_MenuBorderColor, kColorMenuBorder}, {NTCID::kColorId_MenuBorderColor, kColorMenuBorder},
{NTCID::kColorId_MenuItemInitialAlertBackgroundColor, {NTCID::kColorId_MenuItemInitialAlertBackgroundColor,
...@@ -80,24 +80,24 @@ NativeThemeColorIdToColorIdMap() { ...@@ -80,24 +80,24 @@ NativeThemeColorIdToColorIdMap() {
{NTCID::kColorId_MenuItemTargetAlertBackgroundColor, {NTCID::kColorId_MenuItemTargetAlertBackgroundColor,
kColorMenuItemBackgroundAlertedTarget}, kColorMenuItemBackgroundAlertedTarget},
{NTCID::kColorId_DisabledMenuItemForegroundColor, {NTCID::kColorId_DisabledMenuItemForegroundColor,
kColorMenuItemDisabledForeground}, kColorMenuItemForegroundDisabled},
{NTCID::kColorId_EnabledMenuItemForegroundColor, {NTCID::kColorId_EnabledMenuItemForegroundColor,
kColorMenuItemForeground}, kColorMenuItemForeground},
{NTCID::kColorId_HighlightedMenuItemBackgroundColor, {NTCID::kColorId_HighlightedMenuItemBackgroundColor,
kColorMenuItemHighlightedBackground}, kColorMenuItemBackgroundHighlighted},
{NTCID::kColorId_HighlightedMenuItemForegroundColor, {NTCID::kColorId_HighlightedMenuItemForegroundColor,
kColorMenuItemHighlightedForeground}, kColorMenuItemForegroundHighlighted},
{NTCID::kColorId_MenuItemMinorTextColor, {NTCID::kColorId_MenuItemMinorTextColor,
kColorMenuItemSecondaryForeground}, kColorMenuItemForegroundSecondary},
{NTCID::kColorId_FocusedMenuItemBackgroundColor, {NTCID::kColorId_FocusedMenuItemBackgroundColor,
kColorMenuItemSelectedBackground}, kColorMenuItemBackgroundSelected},
{NTCID::kColorId_SelectedMenuItemForegroundColor, {NTCID::kColorId_SelectedMenuItemForegroundColor,
kColorMenuItemSelectedForeground}, kColorMenuItemForegroundSelected},
{NTCID::kColorId_MenuSeparatorColor, kColorMenuSeparator}, {NTCID::kColorId_MenuSeparatorColor, kColorMenuSeparator},
{NTCID::kColorId_TabBottomBorder, kColorTabContentSeparator}, {NTCID::kColorId_TabBottomBorder, kColorTabContentSeparator},
{NTCID::kColorId_TabTitleColorInactive, kColorTabForeground}, {NTCID::kColorId_TabTitleColorInactive, kColorTabForeground},
{NTCID::kColorId_TabSelectedBorderColor, kColorTabSelectedBorder}, {NTCID::kColorId_TabSelectedBorderColor, kColorTabBorderSelected},
{NTCID::kColorId_TabTitleColorActive, kColorTabSelectedForeground}, {NTCID::kColorId_TabTitleColorActive, kColorTabForegroundSelected},
{NTCID::kColorId_TableBackground, kColorTableBackground}, {NTCID::kColorId_TableBackground, kColorTableBackground},
#if defined(OS_APPLE) #if defined(OS_APPLE)
{NTCID::kColorId_TableBackgroundAlternate, {NTCID::kColorId_TableBackgroundAlternate,
...@@ -112,21 +112,21 @@ NativeThemeColorIdToColorIdMap() { ...@@ -112,21 +112,21 @@ NativeThemeColorIdToColorIdMap() {
// TODO(http://crbug.com/1057754): kColorId_TableHeaderSeparator, // TODO(http://crbug.com/1057754): kColorId_TableHeaderSeparator,
// which is implemented as a native theme override on Mac. // which is implemented as a native theme override on Mac.
{NTCID::kColorId_TableSelectionBackgroundFocused, {NTCID::kColorId_TableSelectionBackgroundFocused,
kColorTableSelectedFocusedBackground}, kColorTableBackgroundSelectedFocused},
{NTCID::kColorId_TableSelectedText, {NTCID::kColorId_TableSelectedText,
kColorTableSelectedFocusedForeground}, kColorTableForegroundSelectedFocused},
{NTCID::kColorId_TableSelectionBackgroundUnfocused, {NTCID::kColorId_TableSelectionBackgroundUnfocused,
kColorTableSelectedUnfocusedBackground}, kColorTableBackgroundSelectedUnfocused},
{NTCID::kColorId_TableSelectedTextUnfocused, {NTCID::kColorId_TableSelectedTextUnfocused,
kColorTableSelectedUnfocusedForeground}, kColorTableForegroundSelectedUnfocused},
{NTCID::kColorId_TextfieldDefaultBackground, {NTCID::kColorId_TextfieldDefaultBackground,
kColorTextfieldBackground}, kColorTextfieldBackground},
{NTCID::kColorId_TextfieldReadOnlyBackground, {NTCID::kColorId_TextfieldReadOnlyBackground,
kColorTextfieldDisabledBackground}, kColorTextfieldBackgroundDisabled},
{NTCID::kColorId_TextfieldReadOnlyColor, {NTCID::kColorId_TextfieldReadOnlyColor,
kColorTextfieldDisabledForeground}, kColorTextfieldForegroundDisabled},
{NTCID::kColorId_TextfieldPlaceholderColor, {NTCID::kColorId_TextfieldPlaceholderColor,
kColorTextfieldPlaceholderForeground}, kColorTextfieldForegroundPlaceholder},
{NTCID::kColorId_TextfieldDefaultColor, kColorTextfieldForeground}, {NTCID::kColorId_TextfieldDefaultColor, kColorTextfieldForeground},
{NTCID::kColorId_TextfieldSelectionBackgroundFocused, {NTCID::kColorId_TextfieldSelectionBackgroundFocused,
kColorTextfieldSelectionBackground}, kColorTextfieldSelectionBackground},
...@@ -138,13 +138,13 @@ NativeThemeColorIdToColorIdMap() { ...@@ -138,13 +138,13 @@ NativeThemeColorIdToColorIdMap() {
{NTCID::kColorId_TreeBackground, kColorTreeBackground}, {NTCID::kColorId_TreeBackground, kColorTreeBackground},
{NTCID::kColorId_TreeText, kColorTreeNodeForeground}, {NTCID::kColorId_TreeText, kColorTreeNodeForeground},
{NTCID::kColorId_TreeSelectionBackgroundFocused, {NTCID::kColorId_TreeSelectionBackgroundFocused,
kColorTreeNodeSelectedFocusedBackground}, kColorTreeNodeBackgroundSelectedFocused},
{NTCID::kColorId_TreeSelectedText, {NTCID::kColorId_TreeSelectedText,
kColorTreeNodeSelectedFocusedForeground}, kColorTreeNodeForegroundSelectedFocused},
{NTCID::kColorId_TreeSelectionBackgroundUnfocused, {NTCID::kColorId_TreeSelectionBackgroundUnfocused,
kColorTreeNodeSelectedUnfocusedBackground}, kColorTreeNodeBackgroundSelectedUnfocused},
{NTCID::kColorId_TreeSelectedTextUnfocused, {NTCID::kColorId_TreeSelectedTextUnfocused,
kColorTreeNodeSelectedUnfocusedForeground}, kColorTreeNodeForegroundSelectedUnfocused},
{NTCID::kColorId_WindowBackground, kColorWindowBackground}, {NTCID::kColorId_WindowBackground, kColorWindowBackground},
}); });
return *map; return *map;
......
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