Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/fallback_theme.h" | 5 #include "ui/native_theme/fallback_theme.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "ui/gfx/color_utils.h" | 9 #include "ui/gfx/color_utils.h" |
| 10 #include "ui/native_theme/common_theme.h" | 10 #include "ui/native_theme/common_theme.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 color_utils::AlphaBlend( | 82 color_utils::AlphaBlend( |
| 83 SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xBB); | 83 SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xBB); |
| 84 static const SkColor kResultsTableSelectedOrHoveredUrl = | 84 static const SkColor kResultsTableSelectedOrHoveredUrl = |
| 85 SkColorSetARGB(0xff, 0x00, 0x66, 0x22); | 85 SkColorSetARGB(0xff, 0x00, 0x66, 0x22); |
| 86 static const SkColor kResultsTableNormalDivider = color_utils::AlphaBlend( | 86 static const SkColor kResultsTableNormalDivider = color_utils::AlphaBlend( |
| 87 kResultsTableNormalText, kTextfieldDefaultBackground, 0x34); | 87 kResultsTableNormalText, kTextfieldDefaultBackground, 0x34); |
| 88 static const SkColor kResultsTableHoveredDivider = color_utils::AlphaBlend( | 88 static const SkColor kResultsTableHoveredDivider = color_utils::AlphaBlend( |
| 89 kResultsTableHoveredText, kResultsTableHoveredBackground, 0x34); | 89 kResultsTableHoveredText, kResultsTableHoveredBackground, 0x34); |
| 90 static const SkColor kResultsTabSelectedDivider = color_utils::AlphaBlend( | 90 static const SkColor kResultsTabSelectedDivider = color_utils::AlphaBlend( |
| 91 kResultsTableSelectedText, kTextfieldSelectionBackgroundFocused, 0x34); | 91 kResultsTableSelectedText, kTextfieldSelectionBackgroundFocused, 0x34); |
| 92 // Answers | |
| 93 static const SkColor kAnswerNormalText = | |
|
Justin Donnelly
2015/03/13 21:08:33
I don't think it makes sense to define this as syn
dschuyler
2015/03/13 21:48:23
The reason I went with a separate list is that the
| |
| 94 color_utils::AlphaBlend(SK_ColorBLACK, kTextfieldDefaultBackground, 0xDD); | |
|
Justin Donnelly
2015/03/13 21:08:33
How did you choose the alpha value? 0xDD is the m
dschuyler
2015/03/13 21:48:23
Yes, I used what was used previously. I don't kno
| |
| 95 static const SkColor kAnswerNormalTextHovered = color_utils::AlphaBlend( | |
| 96 SK_ColorBLACK, kResultsTableHoveredBackground, 0xDD); | |
| 97 static const SkColor kAnswerNormalTextSelected = color_utils::AlphaBlend( | |
| 98 SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xDD); | |
| 99 static const SkColor kAnswerInfoText = | |
| 100 color_utils::AlphaBlend(SK_ColorGRAY, kTextfieldDefaultBackground, 0xDD); | |
| 101 static const SkColor kAnswerInfoTextHovered = color_utils::AlphaBlend( | |
| 102 SK_ColorGRAY, kResultsTableHoveredBackground, 0xDD); | |
| 103 static const SkColor kAnswerInfoTextSelected = color_utils::AlphaBlend( | |
| 104 SK_ColorGRAY, kTextfieldSelectionBackgroundFocused, 0xDD); | |
| 105 static const SkColor kAnswerLinkText = | |
| 106 color_utils::AlphaBlend(SK_ColorBLUE, kTextfieldDefaultBackground, 0xDD); | |
| 107 static const SkColor kAnswerLinkTextHovered = color_utils::AlphaBlend( | |
| 108 SK_ColorBLUE, kResultsTableHoveredBackground, 0xDD); | |
| 109 static const SkColor kAnswerLinkTextSelected = color_utils::AlphaBlend( | |
| 110 SK_ColorBLUE, kTextfieldSelectionBackgroundFocused, 0xDD); | |
| 111 static const SkColor kAnswerPositiveText = | |
| 112 color_utils::AlphaBlend(SK_ColorGREEN, kTextfieldDefaultBackground, 0xDD); | |
| 113 static const SkColor kAnswerPositiveTextHovered = color_utils::AlphaBlend( | |
| 114 SK_ColorGREEN, kResultsTableHoveredBackground, 0xDD); | |
| 115 static const SkColor kAnswerPositiveTextSelected = color_utils::AlphaBlend( | |
| 116 SK_ColorGREEN, kTextfieldSelectionBackgroundFocused, 0xDD); | |
| 117 static const SkColor kAnswerNegativeText = | |
| 118 color_utils::AlphaBlend(SK_ColorRED, kTextfieldDefaultBackground, 0xDD); | |
| 119 static const SkColor kAnswerNegativeTextHovered = color_utils::AlphaBlend( | |
| 120 SK_ColorRED, kResultsTableHoveredBackground, 0xDD); | |
| 121 static const SkColor kAnswerNegativeTextSelected = color_utils::AlphaBlend( | |
| 122 SK_ColorRED, kTextfieldSelectionBackgroundFocused, 0xDD); | |
| 92 | 123 |
| 93 SkColor color; | 124 SkColor color; |
| 94 if (CommonThemeGetSystemColor(color_id, &color)) | 125 if (CommonThemeGetSystemColor(color_id, &color)) |
| 95 return color; | 126 return color; |
| 96 | 127 |
| 97 switch (color_id) { | 128 switch (color_id) { |
| 98 // Windows | 129 // Windows |
| 99 case kColorId_WindowBackground: | 130 case kColorId_WindowBackground: |
| 100 return kWindowBackgroundColor; | 131 return kWindowBackgroundColor; |
| 101 | 132 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 199 case kColorId_ResultsTableHoveredUrl: | 230 case kColorId_ResultsTableHoveredUrl: |
| 200 case kColorId_ResultsTableSelectedUrl: | 231 case kColorId_ResultsTableSelectedUrl: |
| 201 return kResultsTableSelectedOrHoveredUrl; | 232 return kResultsTableSelectedOrHoveredUrl; |
| 202 case kColorId_ResultsTableNormalDivider: | 233 case kColorId_ResultsTableNormalDivider: |
| 203 return kResultsTableNormalDivider; | 234 return kResultsTableNormalDivider; |
| 204 case kColorId_ResultsTableHoveredDivider: | 235 case kColorId_ResultsTableHoveredDivider: |
| 205 return kResultsTableHoveredDivider; | 236 return kResultsTableHoveredDivider; |
| 206 case kColorId_ResultsTableSelectedDivider: | 237 case kColorId_ResultsTableSelectedDivider: |
| 207 return kResultsTabSelectedDivider; | 238 return kResultsTabSelectedDivider; |
| 208 | 239 |
| 240 // Answers | |
| 241 case kColorId_AnswerNormalText: | |
| 242 return kAnswerNormalText; | |
| 243 case kColorId_AnswerNormalTextHovered: | |
| 244 return kAnswerNormalTextHovered; | |
| 245 case kColorId_AnswerNormalTextSelected: | |
| 246 return kAnswerNormalTextSelected; | |
| 247 case kColorId_AnswerInfoText: | |
| 248 return kAnswerInfoText; | |
| 249 case kColorId_AnswerInfoTextHovered: | |
| 250 return kAnswerInfoTextHovered; | |
| 251 case kColorId_AnswerInfoTextSelected: | |
| 252 return kAnswerInfoTextSelected; | |
| 253 case kColorId_AnswerLinkText: | |
| 254 return kAnswerLinkText; | |
| 255 case kColorId_AnswerLinkTextHovered: | |
| 256 return kAnswerLinkTextHovered; | |
| 257 case kColorId_AnswerLinkTextSelected: | |
| 258 return kAnswerLinkTextSelected; | |
| 259 case kColorId_AnswerPositiveText: | |
| 260 return kAnswerPositiveText; | |
| 261 case kColorId_AnswerPositiveTextHovered: | |
| 262 return kAnswerPositiveTextHovered; | |
| 263 case kColorId_AnswerPositiveTextSelected: | |
| 264 return kAnswerPositiveTextSelected; | |
| 265 case kColorId_AnswerNegativeText: | |
| 266 return kAnswerNegativeText; | |
| 267 case kColorId_AnswerNegativeTextHovered: | |
| 268 return kAnswerNegativeTextHovered; | |
| 269 case kColorId_AnswerNegativeTextSelected: | |
| 270 return kAnswerNegativeTextSelected; | |
| 271 | |
| 209 default: | 272 default: |
| 210 NOTREACHED(); | 273 NOTREACHED(); |
| 211 break; | 274 break; |
| 212 } | 275 } |
| 213 | 276 |
| 214 return kInvalidColorIdColor; | 277 return kInvalidColorIdColor; |
| 215 } | 278 } |
| 216 | 279 |
| 217 } // namespace ui | 280 } // namespace ui |
| OLD | NEW |