Allow the tiling of theme background images on the NTP....

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 84 matching lines @@
   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 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()))));
 
   // 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));
 
+  subst2.push_back(UTF8ToUTF16(GetNewTabBackgroundTilingCSS()));
+
   // 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));
+  const std::string css_string2 =  UTF16ToASCII(ReplaceStringPlaceholders(
+      ASCIIToUTF16(css_string), subst2, NULL));
 
   // Convert to a format appropriate for sending.
   scoped_refptr<RefCountedBytes> css_bytes(new RefCountedBytes);
-  css_bytes->data.resize(css_string.size());
-  std::copy(css_string.begin(), css_string.end(), css_bytes->data.begin());
+  css_bytes->data.resize(css_string2.size());
+  std::copy(css_string2.begin(), css_string2.end(), css_bytes->data.begin());
 
   // Send.
   SendResponse(request_id, css_bytes);
 }
 
 void DOMUIThemeSource::SendThemeBitmap(int request_id, int resource_id) {
   ThemeProvider* tp = profile_->GetThemeProvider();
   DCHECK(tp);
 
   SkBitmap* image = tp->GetBitmapNamed(resource_id);
@@ skipping 20 matching lines @@
   int offset = BookmarkBarView::kNewtabBarHeight;
 #else
   int offset = 0;
 #endif
 
   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 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);
+}
+