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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xE6, 0xE6, 0xE6), | 60 const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xE6, 0xE6, 0xE6), |
61 SkColorSetRGB(0xF2, 0xF2, 0xF2)}; | 61 SkColorSetRGB(0xF2, 0xF2, 0xF2)}; |
62 const SkColor kDefaultColorToolbarIncognito[] = { | 62 const SkColor kDefaultColorToolbarIncognito[] = { |
63 SkColorSetRGB(0xE6, 0xE6, 0xE6), SkColorSetRGB(0x50, 0x50, 0x50)}; | 63 SkColorSetRGB(0xE6, 0xE6, 0xE6), SkColorSetRGB(0x50, 0x50, 0x50)}; |
64 #else | 64 #else |
65 const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xDF, 0xDF, 0xDF), | 65 const SkColor kDefaultColorToolbar[] = {SkColorSetRGB(0xDF, 0xDF, 0xDF), |
66 SkColorSetRGB(0xF2, 0xF2, 0xF2)}; | 66 SkColorSetRGB(0xF2, 0xF2, 0xF2)}; |
67 const SkColor kDefaultColorToolbarIncognito[] = { | 67 const SkColor kDefaultColorToolbarIncognito[] = { |
68 SkColorSetRGB(0xDF, 0xDF, 0xDF), SkColorSetRGB(0x50, 0x50, 0x50)}; | 68 SkColorSetRGB(0xDF, 0xDF, 0xDF), SkColorSetRGB(0x50, 0x50, 0x50)}; |
69 #endif // OS_MACOSX | 69 #endif // OS_MACOSX |
70 const SkColor kDefaultDetachedBookmarkBarBackground[] = { | |
71 SkColorSetRGB(0xF1, 0xF1, 0xF1), SK_ColorWHITE}; | |
72 const SkColor kDefaultDetachedBookmarkBarBackgroundIncognito[] = { | |
73 SkColorSetRGB(0xF1, 0xF1, 0xF1), SkColorSetRGB(0x32, 0x32, 0x32)}; | |
74 | |
75 constexpr SkColor kDefaultColorTabText = SK_ColorBLACK; | 70 constexpr SkColor kDefaultColorTabText = SK_ColorBLACK; |
76 constexpr SkColor kDefaultColorTabTextIncognito[] = {kDefaultColorTabText, | 71 constexpr SkColor kDefaultColorTabTextIncognito[] = {kDefaultColorTabText, |
77 SK_ColorWHITE}; | 72 SK_ColorWHITE}; |
78 | 73 |
79 #if defined(OS_MACOSX) | 74 #if defined(OS_MACOSX) |
80 constexpr SkColor kDefaultColorBackgroundTabText[] = {SK_ColorBLACK, | 75 constexpr SkColor kDefaultColorBackgroundTabText[] = {SK_ColorBLACK, |
81 SK_ColorBLACK}; | 76 SK_ColorBLACK}; |
82 constexpr SkColor kDefaultColorBackgroundTabTextIncognito[] = { | 77 constexpr SkColor kDefaultColorBackgroundTabTextIncognito[] = { |
83 kDefaultColorBackgroundTabText[0], SK_ColorWHITE}; | 78 kDefaultColorBackgroundTabText[0], SK_ColorWHITE}; |
84 #else | 79 #else |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 kDefaultTintButtons, {-1, -1, 0.85}}; | 117 kDefaultTintButtons, {-1, -1, 0.85}}; |
123 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; | 118 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; |
124 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; | 119 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; |
125 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; | 120 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; |
126 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; | 121 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; |
127 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; | 122 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
128 | 123 |
129 // ---------------------------------------------------------------------------- | 124 // ---------------------------------------------------------------------------- |
130 // Defaults for properties which are not stored in the browser theme pack. | 125 // Defaults for properties which are not stored in the browser theme pack. |
131 | 126 |
132 constexpr SkColor kDefaultColorControlBackground = SK_ColorWHITE; | |
133 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { | 127 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { |
134 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0xB6, 0xB4, 0xB6)}; | 128 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0xB6, 0xB4, 0xB6)}; |
135 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { | 129 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { |
136 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0x28, 0x28, 0x28)}; | 130 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0x28, 0x28, 0x28)}; |
137 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); | 131 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); |
138 | 132 |
139 #if defined(OS_MACOSX) | 133 #if defined(OS_MACOSX) |
140 const SkColor kDefaultColorFrameVibrancyOverlay[] = { | 134 const SkColor kDefaultColorFrameVibrancyOverlay[] = { |
141 SkColorSetA(SK_ColorBLACK, 0x19), SkColorSetARGB(0xE6, 0x14, 0x16, 0x18)}; | 135 SkColorSetA(SK_ColorBLACK, 0x19), SkColorSetARGB(0xE6, 0x14, 0x16, 0x18)}; |
142 const SkColor kDefaultColorToolbarInactive[] = { | 136 const SkColor kDefaultColorToolbarInactive[] = { |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 case COLOR_NTP_SECTION_TEXT: | 348 case COLOR_NTP_SECTION_TEXT: |
355 return kDefaultColorNTPSectionText; | 349 return kDefaultColorNTPSectionText; |
356 case COLOR_NTP_SECTION_LINK: | 350 case COLOR_NTP_SECTION_LINK: |
357 return kDefaultColorNTPSectionLink; | 351 return kDefaultColorNTPSectionLink; |
358 case COLOR_NTP_SECTION_LINK_UNDERLINE: | 352 case COLOR_NTP_SECTION_LINK_UNDERLINE: |
359 return TintForUnderline(kDefaultColorNTPSectionLink); | 353 return TintForUnderline(kDefaultColorNTPSectionLink); |
360 case COLOR_BUTTON_BACKGROUND: | 354 case COLOR_BUTTON_BACKGROUND: |
361 return kDefaultColorButtonBackground; | 355 return kDefaultColorButtonBackground; |
362 | 356 |
363 // Properties not stored in theme pack. | 357 // Properties not stored in theme pack. |
364 case COLOR_CONTROL_BACKGROUND: | |
365 return kDefaultColorControlBackground; | |
366 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: | 358 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: |
367 return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode] | 359 return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode] |
368 : kDefaultColorBookmarkInstructionsText[mode]; | 360 : kDefaultColorBookmarkInstructionsText[mode]; |
369 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: | 361 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: |
370 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: | 362 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: |
371 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] | 363 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] |
372 : kDefaultDetachedBookmarkBarSeparator[mode]; | 364 : kDefaultDetachedBookmarkBarSeparator[mode]; |
373 case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: | |
374 return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] | |
375 : kDefaultDetachedBookmarkBarBackground[mode]; | |
376 case COLOR_TOOLBAR_TOP_SEPARATOR: | 365 case COLOR_TOOLBAR_TOP_SEPARATOR: |
377 case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: | 366 case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: |
378 return kDefaultToolbarTopSeparator; | 367 return kDefaultToolbarTopSeparator; |
379 #if defined(OS_MACOSX) | 368 #if defined(OS_MACOSX) |
380 case COLOR_FRAME_VIBRANCY_OVERLAY: | 369 case COLOR_FRAME_VIBRANCY_OVERLAY: |
381 return kDefaultColorFrameVibrancyOverlay[otr]; | 370 return kDefaultColorFrameVibrancyOverlay[otr]; |
382 case COLOR_TOOLBAR_INACTIVE: | 371 case COLOR_TOOLBAR_INACTIVE: |
383 return otr ? kDefaultColorToolbarInactiveIncognito[mode] | 372 return otr ? kDefaultColorToolbarInactiveIncognito[mode] |
384 : kDefaultColorToolbarInactive[mode]; | 373 : kDefaultColorToolbarInactive[mode]; |
385 case COLOR_BACKGROUND_TAB_INACTIVE: | 374 case COLOR_BACKGROUND_TAB_INACTIVE: |
(...skipping 17 matching lines...) Expand all Loading... |
403 #endif | 392 #endif |
404 case COLOR_FRAME_INCOGNITO: | 393 case COLOR_FRAME_INCOGNITO: |
405 case COLOR_FRAME_INCOGNITO_INACTIVE: | 394 case COLOR_FRAME_INCOGNITO_INACTIVE: |
406 NOTREACHED() << "These values should be queried via their respective " | 395 NOTREACHED() << "These values should be queried via their respective " |
407 "non-incognito equivalents and an appropriate |otr| " | 396 "non-incognito equivalents and an appropriate |otr| " |
408 "value."; | 397 "value."; |
409 default: | 398 default: |
410 return gfx::kPlaceholderColor; | 399 return gfx::kPlaceholderColor; |
411 } | 400 } |
412 } | 401 } |
OLD | NEW |