ui/native_theme/native_theme_dark_aura.cc - Issue 1844003003: Fix MdTextButton colors in incognito windows.

Side by Side Diff: ui/native_theme/native_theme_dark_aura.cc

Issue 1844003003: Fix MdTextButton colors in incognito windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: compile Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/native_theme/native_theme_dark_aura.h"	5 #include "ui/native_theme/native_theme_dark_aura.h"

6	6

7 #include "ui/base/material_design/material_design_controller.h"	7 #include "ui/base/material_design/material_design_controller.h"

8 #include "ui/gfx/color_palette.h"	8 #include "ui/gfx/color_palette.h"

9	9

10 namespace ui {	10 namespace ui {

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 case kColorId_ResultsTableNormalHeadline:	60 case kColorId_ResultsTableNormalHeadline:

61 case kColorId_ResultsTableHoveredHeadline:	61 case kColorId_ResultsTableHoveredHeadline:

62 case kColorId_ResultsTableSelectedHeadline:	62 case kColorId_ResultsTableSelectedHeadline:

63 return kResultsTableText;	63 return kResultsTableText;

64 case kColorId_ResultsTableNormalDimmedText:	64 case kColorId_ResultsTableNormalDimmedText:

65 case kColorId_ResultsTableHoveredDimmedText:	65 case kColorId_ResultsTableHoveredDimmedText:

66 case kColorId_ResultsTableSelectedDimmedText:	66 case kColorId_ResultsTableSelectedDimmedText:

67 return kResultsTableDimmedText;	67 return kResultsTableDimmedText;

68	68

69 // Intentional pass-throughs to NativeThemeAura.	69 // Intentional pass-throughs to NativeThemeAura.

	70 case kColorId_ButtonEnabledColor:

	71 case kColorId_TextOnCallToActionColor:

70 case kColorId_ResultsTableHoveredBackground:	72 case kColorId_ResultsTableHoveredBackground:

71 case kColorId_ResultsTableSelectedBackground:	73 case kColorId_ResultsTableSelectedBackground:

72 case kColorId_ResultsTableNormalUrl:	74 case kColorId_ResultsTableNormalUrl:

73 case kColorId_ResultsTableHoveredUrl:	75 case kColorId_ResultsTableHoveredUrl:

74 case kColorId_ResultsTableSelectedUrl:	76 case kColorId_ResultsTableSelectedUrl:

75 return NativeThemeAura::GetSystemColor(color_id);	77 return NativeThemeAura::GetSystemColor(color_id);

76	78

77 // Any other color is not defined and shouldn't be used in a dark theme.	79 // Any other color is not defined and shouldn't be used in a dark theme.

78 default:	80 case kColorId_WindowBackground:

	81 case kColorId_DialogBackground:

	82 case kColorId_BubbleBackground:

	83 case kColorId_FocusedBorderColor:

	84 case kColorId_UnfocusedBorderColor:

	85 case kColorId_ButtonBackgroundColor:

	86 case kColorId_ButtonDisabledColor:

	87 case kColorId_ButtonHighlightColor:

	88 case kColorId_ButtonHoverColor:

	89 case kColorId_ButtonHoverBackgroundColor:

	90 case kColorId_BlueButtonEnabledColor:

	91 case kColorId_BlueButtonDisabledColor:

	92 case kColorId_BlueButtonPressedColor:

	93 case kColorId_BlueButtonHoverColor:

	94 case kColorId_BlueButtonShadowColor:

	95 case kColorId_EnabledMenuItemForegroundColor:

	96 case kColorId_DisabledMenuItemForegroundColor:

	97 case kColorId_DisabledEmphasizedMenuItemForegroundColor:

	98 case kColorId_SelectedMenuItemForegroundColor:

	99 case kColorId_FocusedMenuItemBackgroundColor:

	100 case kColorId_HoverMenuItemBackgroundColor:

	101 case kColorId_MenuSeparatorColor:

	102 case kColorId_MenuBackgroundColor:

	103 case kColorId_MenuBorderColor:

	104 case kColorId_EnabledMenuButtonBorderColor:

	105 case kColorId_FocusedMenuButtonBorderColor:

	106 case kColorId_HoverMenuButtonBorderColor:

	107 case kColorId_LabelEnabledColor:

	108 case kColorId_LabelDisabledColor:

	109 case kColorId_LabelBackgroundColor:

	110 case kColorId_LinkDisabled:

	111 case kColorId_TextfieldReadOnlyColor:

	112 case kColorId_TextfieldReadOnlyBackground:

	113 case kColorId_TooltipBackground:

	114 case kColorId_TooltipText:

	115 case kColorId_TreeBackground:

	116 case kColorId_TreeText:

	117 case kColorId_TreeSelectedText:

	118 case kColorId_TreeSelectedTextUnfocused:

	119 case kColorId_TreeSelectionBackgroundFocused:

	120 case kColorId_TreeSelectionBackgroundUnfocused:

	121 case kColorId_TreeArrow:

	122 case kColorId_TableBackground:

	123 case kColorId_TableText:

	124 case kColorId_TableSelectedText:

	125 case kColorId_TableSelectedTextUnfocused:

	126 case kColorId_TableSelectionBackgroundFocused:

	127 case kColorId_TableSelectionBackgroundUnfocused:

	128 case kColorId_TableGroupingIndicatorColor:

	129 case kColorId_ResultsTablePositiveText:

	130 case kColorId_ResultsTablePositiveHoveredText:

	131 case kColorId_ResultsTablePositiveSelectedText:

	132 case kColorId_ResultsTableNegativeText:

	133 case kColorId_ResultsTableNegativeHoveredText:

	134 case kColorId_ResultsTableNegativeSelectedText:

	135 case kColorId_ThrobberSpinningColor:

	136 case kColorId_ThrobberWaitingColor:

	137 case kColorId_ThrobberLightColor:

	138 case kColorId_NumColors:

79 return gfx::kPlaceholderColor;	139 return gfx::kPlaceholderColor;

80 }	140 }

	141

	142 NOTREACHED();

	143 return gfx::kPlaceholderColor;

81 }	144 }

82	145

83 NativeThemeDarkAura::NativeThemeDarkAura() {}	146 NativeThemeDarkAura::NativeThemeDarkAura() {}

84	147

85 NativeThemeDarkAura::~NativeThemeDarkAura() {}	148 NativeThemeDarkAura::~NativeThemeDarkAura() {}

86	149

87 } // namespace ui	150 } // namespace ui

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »