| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 const SkColor kDefaultColorBackgroundTabText[] = { | 85 const SkColor kDefaultColorBackgroundTabText[] = { |
| 86 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorBLACK}; | 86 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorBLACK}; |
| 87 const SkColor kDefaultColorBackgroundTabTextIncognito[] = { | 87 const SkColor kDefaultColorBackgroundTabTextIncognito[] = { |
| 88 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorWHITE}; | 88 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorWHITE}; |
| 89 #endif // OS_MACOSX | 89 #endif // OS_MACOSX |
| 90 | 90 |
| 91 constexpr SkColor kDefaultColorBookmarkText = SK_ColorBLACK; | 91 constexpr SkColor kDefaultColorBookmarkText = SK_ColorBLACK; |
| 92 constexpr SkColor kDefaultColorBookmarkTextIncognito[] = { | 92 constexpr SkColor kDefaultColorBookmarkTextIncognito[] = { |
| 93 kDefaultColorBookmarkText, SK_ColorWHITE}; | 93 kDefaultColorBookmarkText, SK_ColorWHITE}; |
| 94 | 94 |
| 95 const SkColor kDefaultColorBookmarkInstructionsText[] = { |
| 96 SK_ColorBLACK, SkColorSetRGB(0x64, 0x64, 0x64)}; |
| 97 const SkColor kDefaultColorBookmarkInstructionsTextIncognito[] = { |
| 98 SK_ColorBLACK, SkColorSetARGB(0x8A, 0xFF, 0xFF, 0xFF)}; |
| 99 |
| 95 #if defined(OS_WIN) | 100 #if defined(OS_WIN) |
| 96 const SkColor kDefaultColorNTPBackground = | 101 const SkColor kDefaultColorNTPBackground = |
| 97 color_utils::GetSysSkColor(COLOR_WINDOW); | 102 color_utils::GetSysSkColor(COLOR_WINDOW); |
| 98 const SkColor kDefaultColorNTPText = | 103 const SkColor kDefaultColorNTPText = |
| 99 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); | 104 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); |
| 100 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); | 105 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); |
| 101 #else | 106 #else |
| 102 // TODO(beng): source from theme provider. | 107 // TODO(beng): source from theme provider. |
| 103 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; | 108 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; |
| 104 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; | 109 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 case COLOR_NTP_SECTION_LINK: | 356 case COLOR_NTP_SECTION_LINK: |
| 352 return kDefaultColorNTPSectionLink; | 357 return kDefaultColorNTPSectionLink; |
| 353 case COLOR_NTP_SECTION_LINK_UNDERLINE: | 358 case COLOR_NTP_SECTION_LINK_UNDERLINE: |
| 354 return TintForUnderline(kDefaultColorNTPSectionLink); | 359 return TintForUnderline(kDefaultColorNTPSectionLink); |
| 355 case COLOR_BUTTON_BACKGROUND: | 360 case COLOR_BUTTON_BACKGROUND: |
| 356 return kDefaultColorButtonBackground; | 361 return kDefaultColorButtonBackground; |
| 357 | 362 |
| 358 // Properties not stored in theme pack. | 363 // Properties not stored in theme pack. |
| 359 case COLOR_CONTROL_BACKGROUND: | 364 case COLOR_CONTROL_BACKGROUND: |
| 360 return kDefaultColorControlBackground; | 365 return kDefaultColorControlBackground; |
| 366 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: |
| 367 return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode] |
| 368 : kDefaultColorBookmarkInstructionsText[mode]; |
| 361 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: | 369 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: |
| 362 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: | 370 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: |
| 363 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] | 371 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] |
| 364 : kDefaultDetachedBookmarkBarSeparator[mode]; | 372 : kDefaultDetachedBookmarkBarSeparator[mode]; |
| 365 case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: | 373 case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: |
| 366 return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] | 374 return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] |
| 367 : kDefaultDetachedBookmarkBarBackground[mode]; | 375 : kDefaultDetachedBookmarkBarBackground[mode]; |
| 368 case COLOR_TOOLBAR_TOP_SEPARATOR: | 376 case COLOR_TOOLBAR_TOP_SEPARATOR: |
| 369 case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: | 377 case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: |
| 370 return kDefaultToolbarTopSeparator; | 378 return kDefaultToolbarTopSeparator; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 395 #endif | 403 #endif |
| 396 case COLOR_FRAME_INCOGNITO: | 404 case COLOR_FRAME_INCOGNITO: |
| 397 case COLOR_FRAME_INCOGNITO_INACTIVE: | 405 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 398 NOTREACHED() << "These values should be queried via their respective " | 406 NOTREACHED() << "These values should be queried via their respective " |
| 399 "non-incognito equivalents and an appropriate |otr| " | 407 "non-incognito equivalents and an appropriate |otr| " |
| 400 "value."; | 408 "value."; |
| 401 default: | 409 default: |
| 402 return gfx::kPlaceholderColor; | 410 return gfx::kPlaceholderColor; |
| 403 } | 411 } |
| 404 } | 412 } |
| OLD | NEW |