Revert incognito and theme inactive color changes.

chrome/browser/themes/theme_properties.cc

Index: chrome/browser/themes/theme_properties.cc
diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc
index 3d09033caeca19b76c4bdac6b3be178ee69dd30d..97e8270fba90f00810a770bb355437ce3cde5b6f 100644
--- a/chrome/browser/themes/theme_properties.cc
+++ b/chrome/browser/themes/theme_properties.cc
@@ -24,14 +24,17 @@ namespace {
 // browser_theme_pack.cc.
 
 const SkColor kDefaultColorFrame = SkColorSetRGB(0xCC, 0xCC, 0xCC);
+const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xF5, 0xF5, 0xF5);
 
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorFrameIncognito =
     SkColorSetARGB(0xE6, 0x14, 0x16, 0x18);
-const SkColor kDefaultColorFrameIncognitoInactiveMac =
+const SkColor kDefaultColorFrameIncognitoInactive =
     SkColorSetRGB(0x1E, 0x1E, 0x1E);
 #else
 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(0x28, 0x2B, 0x2D);
+const SkColor kDefaultColorFrameIncognitoInactive =
+    SkColorSetRGB(0x38, 0x3B, 0x3D);
 #endif
 
 const SkColor kDefaultColorToolbar = SkColorSetRGB(0xF2, 0xF2, 0xF2);
@@ -75,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.9};
+constexpr color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75};
 constexpr color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35};
-constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.2, 0.87};
+constexpr color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6};
 constexpr color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75};
 
 // ----------------------------------------------------------------------------
@@ -228,13 +231,8 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
     case COLOR_FRAME:
       return otr ? kDefaultColorFrameIncognito : kDefaultColorFrame;
     case COLOR_FRAME_INACTIVE:
-#if defined(OS_MACOSX)
-      if (otr)
-        return kDefaultColorFrameIncognitoInactiveMac;
-#endif
-      return color_utils::HSLShift(
-          GetDefaultColor(ThemeProperties::COLOR_FRAME, otr),
-          GetDefaultTint(ThemeProperties::TINT_FRAME_INACTIVE, false));
+      return otr ? kDefaultColorFrameIncognitoInactive
+                 : kDefaultColorFrameInactive;
     case COLOR_TOOLBAR:
       return otr ? kDefaultColorToolbarIncognito : kDefaultColorToolbar;
     case COLOR_TAB_TEXT: