| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/themes/theme_properties.h" | 5 #include "chrome/browser/themes/theme_properties.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); | 59 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); |
| 60 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); | 60 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); |
| 61 #else | 61 #else |
| 62 // TODO(beng): source from theme provider. | 62 // TODO(beng): source from theme provider. |
| 63 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; | 63 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; |
| 64 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; | 64 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; |
| 65 const SkColor kDefaultColorNTPLink = SkColorSetRGB(0x06, 0x37, 0x74); | 65 const SkColor kDefaultColorNTPLink = SkColorSetRGB(0x06, 0x37, 0x74); |
| 66 #endif // OS_WIN | 66 #endif // OS_WIN |
| 67 | 67 |
| 68 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96); | 68 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96); |
| 69 const SkColor kDefaultColorNTPSection = SkColorSetRGB(0xE5, 0xE5, 0xE5); | |
| 70 constexpr SkColor kDefaultColorNTPSectionText = SK_ColorBLACK; | |
| 71 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(0x06, 0x37, 0x74); | |
| 72 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT; | 69 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT; |
| 73 | 70 |
| 74 // Default tints. | 71 // Default tints. |
| 75 constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; | 72 constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; |
| 76 constexpr color_utils::HSL kDefaultTintButtonsIncognito = {-1, -1, 0.85}; | 73 constexpr color_utils::HSL kDefaultTintButtonsIncognito = {-1, -1, 0.85}; |
| 77 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; | 74 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; |
| 78 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.9}; | 75 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.9}; |
| 79 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; | 76 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; |
| 80 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.2, 0.87}; | 77 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.2, 0.87}; |
| 81 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; | 78 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 constexpr char kAlignmentBottom[] = "bottom"; | 122 constexpr char kAlignmentBottom[] = "bottom"; |
| 126 constexpr char kAlignmentLeft[] = "left"; | 123 constexpr char kAlignmentLeft[] = "left"; |
| 127 constexpr char kAlignmentRight[] = "right"; | 124 constexpr char kAlignmentRight[] = "right"; |
| 128 | 125 |
| 129 // Strings used in background tiling repetition properties. | 126 // Strings used in background tiling repetition properties. |
| 130 constexpr char kTilingNoRepeat[] = "no-repeat"; | 127 constexpr char kTilingNoRepeat[] = "no-repeat"; |
| 131 constexpr char kTilingRepeatX[] = "repeat-x"; | 128 constexpr char kTilingRepeatX[] = "repeat-x"; |
| 132 constexpr char kTilingRepeatY[] = "repeat-y"; | 129 constexpr char kTilingRepeatY[] = "repeat-y"; |
| 133 constexpr char kTilingRepeat[] = "repeat"; | 130 constexpr char kTilingRepeat[] = "repeat"; |
| 134 | 131 |
| 135 SkColor TintForUnderline(SkColor input) { | |
| 136 return SkColorSetA(input, SkColorGetA(input) / 3); | |
| 137 } | |
| 138 | |
| 139 } // namespace | 132 } // namespace |
| 140 | 133 |
| 141 // static | 134 // static |
| 142 int ThemeProperties::StringToAlignment(const std::string& alignment) { | 135 int ThemeProperties::StringToAlignment(const std::string& alignment) { |
| 143 int alignment_mask = 0; | 136 int alignment_mask = 0; |
| 144 for (const std::string& component : base::SplitString( | 137 for (const std::string& component : base::SplitString( |
| 145 alignment, base::kWhitespaceASCII, | 138 alignment, base::kWhitespaceASCII, |
| 146 base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { | 139 base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) { |
| 147 if (base::LowerCaseEqualsASCII(component, kAlignmentTop)) | 140 if (base::LowerCaseEqualsASCII(component, kAlignmentTop)) |
| 148 alignment_mask |= ALIGN_TOP; | 141 alignment_mask |= ALIGN_TOP; |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 return otr ? kDefaultColorToolbarTextIncognito : kDefaultColorToolbarText; | 235 return otr ? kDefaultColorToolbarTextIncognito : kDefaultColorToolbarText; |
| 243 case COLOR_BACKGROUND_TAB_TEXT: | 236 case COLOR_BACKGROUND_TAB_TEXT: |
| 244 return otr ? kDefaultColorBackgroundTabTextIncognito | 237 return otr ? kDefaultColorBackgroundTabTextIncognito |
| 245 : kDefaultColorBackgroundTabText; | 238 : kDefaultColorBackgroundTabText; |
| 246 case COLOR_NTP_BACKGROUND: | 239 case COLOR_NTP_BACKGROUND: |
| 247 return kDefaultColorNTPBackground; | 240 return kDefaultColorNTPBackground; |
| 248 case COLOR_NTP_TEXT: | 241 case COLOR_NTP_TEXT: |
| 249 return kDefaultColorNTPText; | 242 return kDefaultColorNTPText; |
| 250 case COLOR_NTP_LINK: | 243 case COLOR_NTP_LINK: |
| 251 return kDefaultColorNTPLink; | 244 return kDefaultColorNTPLink; |
| 252 case COLOR_NTP_LINK_UNDERLINE: | |
| 253 return TintForUnderline(kDefaultColorNTPLink); | |
| 254 case COLOR_NTP_HEADER: | 245 case COLOR_NTP_HEADER: |
| 255 return kDefaultColorNTPHeader; | 246 return kDefaultColorNTPHeader; |
| 256 case COLOR_NTP_SECTION: | |
| 257 return kDefaultColorNTPSection; | |
| 258 case COLOR_NTP_SECTION_TEXT: | |
| 259 return kDefaultColorNTPSectionText; | |
| 260 case COLOR_NTP_SECTION_LINK: | |
| 261 return kDefaultColorNTPSectionLink; | |
| 262 case COLOR_NTP_SECTION_LINK_UNDERLINE: | |
| 263 return TintForUnderline(kDefaultColorNTPSectionLink); | |
| 264 case COLOR_BUTTON_BACKGROUND: | 247 case COLOR_BUTTON_BACKGROUND: |
| 265 return kDefaultColorButtonBackground; | 248 return kDefaultColorButtonBackground; |
| 266 | 249 |
| 267 // Properties not stored in theme pack. | 250 // Properties not stored in theme pack. |
| 268 case COLOR_CONTROL_BACKGROUND: | 251 case COLOR_CONTROL_BACKGROUND: |
| 269 return kDefaultColorControlBackground; | 252 return kDefaultColorControlBackground; |
| 270 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: | 253 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: |
| 271 return otr ? kDefaultColorBookmarkInstructionsTextIncognito | 254 return otr ? kDefaultColorBookmarkInstructionsTextIncognito |
| 272 : kDefaultColorBookmarkInstructionsText; | 255 : kDefaultColorBookmarkInstructionsText; |
| 273 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: | 256 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 case COLOR_FRAME_INCOGNITO: | 298 case COLOR_FRAME_INCOGNITO: |
| 316 case COLOR_FRAME_INCOGNITO_INACTIVE: | 299 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 317 NOTREACHED() << "These values should be queried via their respective " | 300 NOTREACHED() << "These values should be queried via their respective " |
| 318 "non-incognito equivalents and an appropriate |otr| " | 301 "non-incognito equivalents and an appropriate |otr| " |
| 319 "value."; | 302 "value."; |
| 320 return gfx::kPlaceholderColor; | 303 return gfx::kPlaceholderColor; |
| 321 } | 304 } |
| 322 | 305 |
| 323 return gfx::kPlaceholderColor; | 306 return gfx::kPlaceholderColor; |
| 324 } | 307 } |
| OLD | NEW |