First pass at NNTP theming....

chrome/browser/dom_ui/dom_ui_theme_source.cc

 // Copyright (c) 2009 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/dom_ui/dom_ui_theme_source.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/gfx/png_encoder.h"
@@ skipping 82 matching lines @@
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_BACKGROUND);
   SkColor color_text = tp->GetColor(BrowserThemeProvider::COLOR_NTP_TEXT);
   SkColor color_link = tp->GetColor(BrowserThemeProvider::COLOR_NTP_LINK);
   SkColor color_section =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION);
   SkColor color_section_text =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_TEXT);
   SkColor color_section_link =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_LINK);
 
+  // Generate a lighter color.
+  skia::HSL section_lighter;
+  skia::SkColorToHSL(color_section, section_lighter);
+  section_lighter.l += (1 - section_lighter.l) * 0.33;
+  section_lighter.s += (1 - section_lighter.s) * 0.1;
+  SkColor color_section_lighter =
+      skia::HSLToSkColor(SkColorGetA(color_section), section_lighter);
+
   // Generate the replacements.
   std::vector<string16> subst;
   // A second list of replacements, each of which must be in $$x format,
   // where x is a digit from 1-9.
   std::vector<string16> subst2;
 
   // Cache-buster for background.
   subst.push_back(UTF8ToUTF16(IntToString(static_cast<int>(
-      base::Time::Now().ToDoubleT()))));
+      base::Time::Now().ToDoubleT()))));  // $1
 
   // Colors.
-  subst.push_back(SkColorToRGBAString(color_background));
-  subst.push_back(UTF8ToUTF16(GetNewTabBackgroundCSS(false)));
-  subst.push_back(UTF8ToUTF16(GetNewTabBackgroundCSS(true)));
-  subst.push_back(SkColorToRGBAString(color_text));
-  subst.push_back(SkColorToRGBAString(color_link));
-  subst.push_back(SkColorToRGBAString(color_section));
-  subst.push_back(SkColorToRGBAString(color_section_text));
-  subst.push_back(SkColorToRGBAString(color_section_link));
+  subst.push_back(SkColorToRGBAString(color_background));  // $2
+  subst.push_back(UTF8ToUTF16(GetNewTabBackgroundCSS(false)));  // $3
+  subst.push_back(UTF8ToUTF16(GetNewTabBackgroundCSS(true)));  // $4
+  subst.push_back(UTF8ToUTF16(GetNewTabBackgroundTilingCSS()));  // $5
+  subst.push_back(SkColorToRGBAString(color_section));  // $6
+  subst.push_back(SkColorToRGBAString(color_section_lighter));  // $7
+  subst.push_back(SkColorToRGBAString(color_text));  // $8
+  subst.push_back(SkColorToRGBAString(color_link));  // $9
 
-  subst2.push_back(UTF8ToUTF16(GetNewTabBackgroundTilingCSS()));
+  subst2.push_back(SkColorToRGBAString(color_section_text));  // $$1
+  subst2.push_back(SkColorToRGBAString(color_section_link));  // $$2
 
   // Get our template.
   static const StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_NEW_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
   string16 format_string = ASCIIToUTF16(new_tab_theme_css.as_string());
   const std::string css_string = UTF16ToASCII(ReplaceStringPlaceholders(
       format_string, subst, NULL));
@@ skipping 36 matching lines @@
     return BrowserThemeProvider::AlignmentToString(alignment);
 
   // The bar is detached, so we must offset the background by the bar size
   // if it's a top-aligned bar.
 #if defined(OS_WIN)
   int offset = BookmarkBarView::kNewtabBarHeight;
 #else
   int offset = 0;
 #endif
 
+  // TODO(glen): This is a quick workaround to hide the notused.png image when
+  // no image is provided - we don't have time right now to figure out why
+  // this is painting as white.
+  // http://crbug.com/17593
+  if (!profile_->GetThemeProvider()->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
+    return "-64px";
+  }
+
   if (alignment & BrowserThemeProvider::ALIGN_TOP) {
     if (alignment & BrowserThemeProvider::ALIGN_LEFT)
       return "0% " + IntToString(-offset) + "px";
     else if (alignment & BrowserThemeProvider::ALIGN_RIGHT)
       return "100% " + IntToString(-offset) + "px";
     return "center " + IntToString(-offset) + "px";
   }
   return BrowserThemeProvider::AlignmentToString(alignment);
 }
 
 std::string DOMUIThemeSource::GetNewTabBackgroundTilingCSS() {
   int repeat_mode;
   profile_->GetThemeProvider()->GetDisplayProperty(
       BrowserThemeProvider::NTP_BACKGROUND_TILING, &repeat_mode);
   return BrowserThemeProvider::TilingToString(repeat_mode);
 }