Make NTP look good with themes.

chrome/browser/themes/browser_theme_provider.cc

 // Copyright (c) 2010 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/browser_theme_provider.h"
 
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ skipping 25 matching lines @@
 
 // Saved default values.
 const char* BrowserThemeProvider::kDefaultThemeID = "";
 
 namespace {
 
 SkColor TintForUnderline(SkColor input) {
   return SkColorSetA(input, SkColorGetA(input) / 3);
 }
 
+SkColor IncreaseLightness(SkColor color, double percent) {
+  color_utils::HSL result;
+  color_utils::SkColorToHSL(color, &result);
+  result.l += (1 - result.l) * percent;
+  return color_utils::HSLToSkColor(result, SkColorGetA(color));
+}
+
 // Default colors.
 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139);
 const SkColor kDefaultColorFrameIncognitoInactive =
     SkColorSetRGB(126, 139, 156);
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
 #else
 const SkColor kDefaultColorToolbar = SkColorSetRGB(223, 223, 223);
@@ skipping 16 matching lines @@
 #else
 // TODO(beng): source from theme provider.
 const SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
 const SkColor kDefaultColorNTPText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116);
 #endif
 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(75, 140, 220);
 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 239, 254);
 const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116);
-const SkColor kDefaultColorNTPSectionHeaderText = SkColorSetRGB(76, 76, 76);
-const SkColor kDefaultColorNTPSectionHeaderRule = SkColorSetRGB(179, 179, 179);
-const SkColor kDefaultColorNTPSectionHeaderRuleLight =
-    SkColorSetRGB(220, 220, 220);
 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0);
 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0);
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
 const SkColor kDefaultColorToolbarButtonStrokeInactive =
     SkColorSetARGB(75, 99, 99, 99);
 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247);
 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103);
 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123);
 #endif
@@ skipping 121 matching lines @@
   return bitmap;
 }
 
 SkColor BrowserThemeProvider::GetColor(int id) const {
   DCHECK(CalledOnValidThread());
 
   SkColor color;
   if (theme_pack_.get() && theme_pack_->GetColor(id, &color))
     return color;
 
+  // For backward compat with older themes, some newer colors are generated from
+  // older ones if they are missing.
+  switch (id) {
+    case COLOR_NTP_SECTION_HEADER_TEXT:
+      return IncreaseLightness(GetColor(COLOR_NTP_TEXT), 0.30);
+    case COLOR_NTP_SECTION_HEADER_TEXT_HOVER:
+      return GetColor(COLOR_NTP_TEXT);
+    case COLOR_NTP_SECTION_HEADER_RULE:
+      return IncreaseLightness(GetColor(COLOR_NTP_TEXT), 0.70);
+    case COLOR_NTP_SECTION_HEADER_RULE_LIGHT:
+      return IncreaseLightness(GetColor(COLOR_NTP_TEXT), 0.86);
+  }
+
   return GetDefaultColor(id);
 }
 
 bool BrowserThemeProvider::GetDisplayProperty(int id, int* result) const {
   if (theme_pack_.get())
     return theme_pack_->GetDisplayProperty(id, result);
 
   return GetDefaultDisplayProperty(id, result);
 }
 
@@ skipping 204 matching lines @@
     case COLOR_NTP_HEADER:
       return kDefaultColorNTPHeader;
     case COLOR_NTP_SECTION:
       return kDefaultColorNTPSection;
     case COLOR_NTP_SECTION_TEXT:
       return kDefaultColorNTPSectionText;
     case COLOR_NTP_SECTION_LINK:
       return kDefaultColorNTPSectionLink;
     case COLOR_NTP_SECTION_LINK_UNDERLINE:
       return TintForUnderline(kDefaultColorNTPSectionLink);
-    case COLOR_NTP_SECTION_HEADER_TEXT:
-      return kDefaultColorNTPSectionHeaderText;
-    case COLOR_NTP_SECTION_HEADER_TEXT_HOVER:
-      return kDefaultColorNTPText;
-    case COLOR_NTP_SECTION_HEADER_RULE:
-      return kDefaultColorNTPSectionHeaderRule;
-    case COLOR_NTP_SECTION_HEADER_RULE_LIGHT:
-      return kDefaultColorNTPSectionHeaderRuleLight;
     case COLOR_CONTROL_BACKGROUND:
       return kDefaultColorControlBackground;
     case COLOR_BUTTON_BACKGROUND:
       return kDefaultColorButtonBackground;
 #if defined(OS_MACOSX)
     case COLOR_TOOLBAR_BUTTON_STROKE:
       return kDefaultColorToolbarButtonStroke;
     case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE:
       return kDefaultColorToolbarButtonStrokeInactive;
     case COLOR_TOOLBAR_BEZEL:
@@ skipping 143 matching lines @@
 void BrowserThemeProvider::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void BrowserThemeProvider::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }