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 17 matching lines...) Expand all Loading... | |
102 color_utils::GetSysSkColor(COLOR_WINDOW); | 97 color_utils::GetSysSkColor(COLOR_WINDOW); |
103 const SkColor kDefaultColorNTPText = | 98 const SkColor kDefaultColorNTPText = |
104 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); | 99 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); |
105 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); | 100 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); |
106 #else | 101 #else |
107 // TODO(beng): source from theme provider. | 102 // TODO(beng): source from theme provider. |
108 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; | 103 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; |
109 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; | 104 constexpr SkColor kDefaultColorNTPText = SK_ColorBLACK; |
110 const SkColor kDefaultColorNTPLink = SkColorSetRGB(0x06, 0x37, 0x74); | 105 const SkColor kDefaultColorNTPLink = SkColorSetRGB(0x06, 0x37, 0x74); |
111 #endif // OS_WIN | 106 #endif // OS_WIN |
107 const SkColor kDefaultColorNTPBackgroundIncognito[] = { | |
108 kDefaultColorNTPText, SkColorSetRGB(0x32, 0x32, 0x32)}; | |
Peter Kasting
2016/08/18 09:12:36
I think you meant kDefaultColorNTPBackground here,
| |
109 const SkColor kDefaultColorNTPTextIncognito[] = { | |
110 kDefaultColorNTPText, SkColorSetARGB(0x8A, 0xFF, 0xFF, 0xFF)}; | |
Peter Kasting
2016/08/18 09:12:36
Is this latter value supposed to stay in sync with
| |
112 | 111 |
113 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96); | 112 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96); |
114 const SkColor kDefaultColorNTPSection = SkColorSetRGB(0xE5, 0xE5, 0xE5); | 113 const SkColor kDefaultColorNTPSection = SkColorSetRGB(0xE5, 0xE5, 0xE5); |
115 constexpr SkColor kDefaultColorNTPSectionText = SK_ColorBLACK; | 114 constexpr SkColor kDefaultColorNTPSectionText = SK_ColorBLACK; |
116 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(0x06, 0x37, 0x74); | 115 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(0x06, 0x37, 0x74); |
117 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT; | 116 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT; |
118 | 117 |
119 // Default tints. | 118 // Default tints. |
120 constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; | 119 constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; |
121 constexpr color_utils::HSL kDefaultTintButtonsIncognito[] = { | 120 constexpr color_utils::HSL kDefaultTintButtonsIncognito[] = { |
122 kDefaultTintButtons, {-1, -1, 0.85}}; | 121 kDefaultTintButtons, {-1, -1, 0.85}}; |
123 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; | 122 constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; |
124 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; | 123 constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; |
125 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; | 124 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; |
126 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; | 125 constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; |
127 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; | 126 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
128 | 127 |
129 // ---------------------------------------------------------------------------- | 128 // ---------------------------------------------------------------------------- |
130 // Defaults for properties which are not stored in the browser theme pack. | 129 // Defaults for properties which are not stored in the browser theme pack. |
131 | 130 |
132 constexpr SkColor kDefaultColorControlBackground = SK_ColorWHITE; | |
133 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { | 131 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { |
134 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0xB6, 0xB4, 0xB6)}; | 132 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0xB6, 0xB4, 0xB6)}; |
135 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { | 133 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { |
136 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0x28, 0x28, 0x28)}; | 134 SkColorSetRGB(0xAA, 0xAA, 0xAB), SkColorSetRGB(0x28, 0x28, 0x28)}; |
137 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); | 135 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); |
138 | 136 |
139 #if defined(OS_MACOSX) | 137 #if defined(OS_MACOSX) |
140 const SkColor kDefaultColorFrameVibrancyOverlay[] = { | 138 const SkColor kDefaultColorFrameVibrancyOverlay[] = { |
141 SkColorSetA(SK_ColorBLACK, 0x19), SkColorSetARGB(0xE6, 0x14, 0x16, 0x18)}; | 139 SkColorSetA(SK_ColorBLACK, 0x19), SkColorSetARGB(0xE6, 0x14, 0x16, 0x18)}; |
142 const SkColor kDefaultColorToolbarInactive[] = { | 140 const SkColor kDefaultColorToolbarInactive[] = { |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
333 case COLOR_TAB_TEXT: | 331 case COLOR_TAB_TEXT: |
334 return otr ? kDefaultColorTabTextIncognito[mode] | 332 return otr ? kDefaultColorTabTextIncognito[mode] |
335 : kDefaultColorTabText; | 333 : kDefaultColorTabText; |
336 case COLOR_BACKGROUND_TAB_TEXT: | 334 case COLOR_BACKGROUND_TAB_TEXT: |
337 return otr ? kDefaultColorBackgroundTabTextIncognito[mode] | 335 return otr ? kDefaultColorBackgroundTabTextIncognito[mode] |
338 : kDefaultColorBackgroundTabText[mode]; | 336 : kDefaultColorBackgroundTabText[mode]; |
339 case COLOR_BOOKMARK_TEXT: | 337 case COLOR_BOOKMARK_TEXT: |
340 return otr ? kDefaultColorBookmarkTextIncognito[mode] | 338 return otr ? kDefaultColorBookmarkTextIncognito[mode] |
341 : kDefaultColorBookmarkText; | 339 : kDefaultColorBookmarkText; |
342 case COLOR_NTP_BACKGROUND: | 340 case COLOR_NTP_BACKGROUND: |
343 return kDefaultColorNTPBackground; | 341 return otr ? kDefaultColorNTPBackgroundIncognito[mode] |
342 : kDefaultColorNTPBackground; | |
344 case COLOR_NTP_TEXT: | 343 case COLOR_NTP_TEXT: |
345 return kDefaultColorNTPText; | 344 return otr ? kDefaultColorNTPTextIncognito[mode] : kDefaultColorNTPText; |
Peter Kasting
2016/08/18 09:12:36
So before this change was the incognito NTP text a
| |
346 case COLOR_NTP_LINK: | 345 case COLOR_NTP_LINK: |
347 return kDefaultColorNTPLink; | 346 return kDefaultColorNTPLink; |
348 case COLOR_NTP_LINK_UNDERLINE: | 347 case COLOR_NTP_LINK_UNDERLINE: |
349 return TintForUnderline(kDefaultColorNTPLink); | 348 return TintForUnderline(kDefaultColorNTPLink); |
350 case COLOR_NTP_HEADER: | 349 case COLOR_NTP_HEADER: |
351 return kDefaultColorNTPHeader; | 350 return kDefaultColorNTPHeader; |
352 case COLOR_NTP_SECTION: | 351 case COLOR_NTP_SECTION: |
353 return kDefaultColorNTPSection; | 352 return kDefaultColorNTPSection; |
354 case COLOR_NTP_SECTION_TEXT: | 353 case COLOR_NTP_SECTION_TEXT: |
355 return kDefaultColorNTPSectionText; | 354 return kDefaultColorNTPSectionText; |
356 case COLOR_NTP_SECTION_LINK: | 355 case COLOR_NTP_SECTION_LINK: |
357 return kDefaultColorNTPSectionLink; | 356 return kDefaultColorNTPSectionLink; |
358 case COLOR_NTP_SECTION_LINK_UNDERLINE: | 357 case COLOR_NTP_SECTION_LINK_UNDERLINE: |
359 return TintForUnderline(kDefaultColorNTPSectionLink); | 358 return TintForUnderline(kDefaultColorNTPSectionLink); |
360 case COLOR_BUTTON_BACKGROUND: | 359 case COLOR_BUTTON_BACKGROUND: |
361 return kDefaultColorButtonBackground; | 360 return kDefaultColorButtonBackground; |
362 | 361 |
363 // Properties not stored in theme pack. | 362 // Properties not stored in theme pack. |
364 case COLOR_CONTROL_BACKGROUND: | |
365 return kDefaultColorControlBackground; | |
366 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: | 363 case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT: |
367 return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode] | 364 return otr ? kDefaultColorBookmarkInstructionsTextIncognito[mode] |
368 : kDefaultColorBookmarkInstructionsText[mode]; | 365 : kDefaultColorBookmarkInstructionsText[mode]; |
369 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: | 366 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: |
370 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: | 367 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: |
371 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] | 368 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] |
372 : kDefaultDetachedBookmarkBarSeparator[mode]; | 369 : kDefaultDetachedBookmarkBarSeparator[mode]; |
373 case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: | |
374 return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] | |
375 : kDefaultDetachedBookmarkBarBackground[mode]; | |
376 case COLOR_TOOLBAR_TOP_SEPARATOR: | 370 case COLOR_TOOLBAR_TOP_SEPARATOR: |
377 case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: | 371 case COLOR_TOOLBAR_TOP_SEPARATOR_INACTIVE: |
378 return kDefaultToolbarTopSeparator; | 372 return kDefaultToolbarTopSeparator; |
379 #if defined(OS_MACOSX) | 373 #if defined(OS_MACOSX) |
380 case COLOR_FRAME_VIBRANCY_OVERLAY: | 374 case COLOR_FRAME_VIBRANCY_OVERLAY: |
381 return kDefaultColorFrameVibrancyOverlay[otr]; | 375 return kDefaultColorFrameVibrancyOverlay[otr]; |
382 case COLOR_TOOLBAR_INACTIVE: | 376 case COLOR_TOOLBAR_INACTIVE: |
383 return otr ? kDefaultColorToolbarInactiveIncognito[mode] | 377 return otr ? kDefaultColorToolbarInactiveIncognito[mode] |
384 : kDefaultColorToolbarInactive[mode]; | 378 : kDefaultColorToolbarInactive[mode]; |
385 case COLOR_BACKGROUND_TAB_INACTIVE: | 379 case COLOR_BACKGROUND_TAB_INACTIVE: |
(...skipping 17 matching lines...) Expand all Loading... | |
403 #endif | 397 #endif |
404 case COLOR_FRAME_INCOGNITO: | 398 case COLOR_FRAME_INCOGNITO: |
405 case COLOR_FRAME_INCOGNITO_INACTIVE: | 399 case COLOR_FRAME_INCOGNITO_INACTIVE: |
406 NOTREACHED() << "These values should be queried via their respective " | 400 NOTREACHED() << "These values should be queried via their respective " |
407 "non-incognito equivalents and an appropriate |otr| " | 401 "non-incognito equivalents and an appropriate |otr| " |
408 "value."; | 402 "value."; |
409 default: | 403 default: |
410 return gfx::kPlaceholderColor; | 404 return gfx::kPlaceholderColor; |
411 } | 405 } |
412 } | 406 } |
OLD | NEW |