Chromium Code Reviews| Index: chrome/browser/themes/theme_properties.cc |
| diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc |
| index b63da408bb452e0a067bce171621a9a27ba41c80..87b295900fcba1ab52523da8d37ced68d1306048 100644 |
| --- a/chrome/browser/themes/theme_properties.cc |
| +++ b/chrome/browser/themes/theme_properties.cc |
| @@ -24,12 +24,7 @@ namespace { |
| // browser_theme_pack.cc. |
| const SkColor kDefaultColorFrame = SkColorSetRGB(0xCC, 0xCC, 0xCC); |
| -#if defined(OS_MACOSX) |
| -// Used for theme fallback colors. |
| const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xF6, 0xF6, 0xF6); |
|
Peter Kasting
2016/12/01 06:19:04
Shouldn't this be 0xF5?
0xCC = 204
204 + (255 - 2
Bret
2016/12/08 00:16:07
Yes it's supposed to be F5, but I thought a tiny s
Peter Kasting
2016/12/08 00:24:50
Oh, my intent was to just change the OS X color to
Bret
2016/12/08 02:16:59
Ok, changed to F5.
I'll find out what we want to
|
| -#else |
| -const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xDC, 0xDC, 0xDC); |
| -#endif |
| #if defined(OS_MACOSX) |
| const SkColor kDefaultColorFrameIncognito = |
| @@ -39,7 +34,7 @@ const SkColor kDefaultColorFrameIncognitoInactive = |
| #else |
| const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(0x28, 0x2B, 0x2D); |
| const SkColor kDefaultColorFrameIncognitoInactive = |
| - SkColorSetRGB(0x38, 0x3B, 0x3D); |
| + SkColorSetRGB(0xD4, 0xD5, 0xD5); |
|
Evan Stade
2016/11/30 23:27:48
seems a little odd that this is ever so slightly n
Bret
2016/11/30 23:39:30
Yes, I agree it's odd. I decided to leave it becau
Peter Kasting
2016/12/01 06:19:04
Let's leave it as #D4D5D5.
|
| #endif |
| const SkColor kDefaultColorToolbar = SkColorSetRGB(0xF2, 0xF2, 0xF2); |
| @@ -83,9 +78,9 @@ constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT; |
| constexpr color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; |
| constexpr color_utils::HSL kDefaultTintButtonsIncognito = {-1, -1, 0.85}; |
| constexpr color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; |
| -constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; |
| +constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.9}; |
| constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; |
| -constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; |
| +constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.2, 0.87}; |
| constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
| // ---------------------------------------------------------------------------- |