Revert incognito and theme inactive color changes.

chrome/browser/themes/theme_properties.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_properties.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // ----------------------------------------------------------------------------
 // Defaults for properties which are stored in the browser theme pack. If you
 // change these defaults, you must increment the version number in
 // 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);
 const SkColor kDefaultColorToolbarIncognito = SkColorSetRGB(0x50, 0x50, 0x50);
 
 const SkColor kDefaultDetachedBookmarkBarBackground = SK_ColorWHITE;
 const SkColor kDefaultDetachedBookmarkBarBackgroundIncognito =
     SkColorSetRGB(0x32, 0x32, 0x32);
 
 // "Toolbar" text is used for active tabs and the bookmarks bar.
@@ skipping 23 matching lines @@
 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(0x96, 0x96, 0x96);
 const SkColor kDefaultColorNTPSection = SkColorSetRGB(0xE5, 0xE5, 0xE5);
 constexpr SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(0x06, 0x37, 0x74);
 constexpr SkColor kDefaultColorButtonBackground = SK_ColorTRANSPARENT;
 
 // Default tints.
 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};
 
 // ----------------------------------------------------------------------------
 // Defaults for properties which are not stored in the browser theme pack.
 
 constexpr SkColor kDefaultColorControlBackground = SK_ColorWHITE;
 const SkColor kDefaultDetachedBookmarkBarSeparator =
     SkColorSetRGB(0xB6, 0xB4, 0xB6);
 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito =
     SkColorSetRGB(0x28, 0x28, 0x28);
@@ skipping 130 matching lines @@
   }
 }
 
 // static
 SkColor ThemeProperties::GetDefaultColor(int id, bool otr) {
   switch (id) {
     // Properties stored in theme pack.
     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:
     case COLOR_BOOKMARK_TEXT:
       return otr ? kDefaultColorToolbarTextIncognito : kDefaultColorToolbarText;
     case COLOR_BACKGROUND_TAB_TEXT:
       return otr ? kDefaultColorBackgroundTabTextIncognito
                  : kDefaultColorBackgroundTabText;
     case COLOR_NTP_BACKGROUND:
       return kDefaultColorNTPBackground;
@@ skipping 67 matching lines @@
     case COLOR_FRAME_INCOGNITO:
     case COLOR_FRAME_INCOGNITO_INACTIVE:
       NOTREACHED() << "These values should be queried via their respective "
                       "non-incognito equivalents and an appropriate |otr| "
                       "value.";
       return gfx::kPlaceholderColor;
   }
 
   return gfx::kPlaceholderColor;
 }