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

chrome/browser/browser_theme_provider.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/browser_theme_provider.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 46 matching lines @@
 const char* BrowserThemeProvider::kTintFrame = "frame";
 const char* BrowserThemeProvider::kTintFrameInactive = "frame_inactive";
 const char* BrowserThemeProvider::kTintFrameIncognito = "frame_incognito";
 const char* BrowserThemeProvider::kTintFrameIncognitoInactive =
     "frame_incognito_inactive";
 const char* BrowserThemeProvider::kTintBackgroundTab = "background_tab";
 
 // Strings used by themes to identify miscellaneous numerical properties.
 const char* BrowserThemeProvider::kDisplayPropertyNTPAlignment =
     "ntp_background_alignment";
+const char* BrowserThemeProvider::kDisplayPropertyNTPTiling =
+    "ntp_background_repeat";
 
 // Strings used in alignment properties.
 const char* BrowserThemeProvider::kAlignmentTop = "top";
 const char* BrowserThemeProvider::kAlignmentBottom = "bottom";
 const char* BrowserThemeProvider::kAlignmentLeft = "left";
 const char* BrowserThemeProvider::kAlignmentRight = "right";
 
+// Strings used in background tiling repetition properties.
+const char* BrowserThemeProvider::kTilingNoRepeat = "no-repeat";
+const char* BrowserThemeProvider::kTilingRepeatX = "repeat-x";
+const char* BrowserThemeProvider::kTilingRepeatY = "repeat-y";
+const char* BrowserThemeProvider::kTilingRepeat = "repeat";
+
 // Default colors.
 const SkColor BrowserThemeProvider::kDefaultColorFrame =
     SkColorSetRGB(77, 139, 217);
 const SkColor BrowserThemeProvider::kDefaultColorFrameInactive =
     SkColorSetRGB(152, 188, 233);
 const SkColor BrowserThemeProvider::kDefaultColorFrameIncognito =
     SkColorSetRGB(83, 106, 139);
 const SkColor BrowserThemeProvider::kDefaultColorFrameIncognitoInactive =
     SkColorSetRGB(126, 139, 156);
 const SkColor BrowserThemeProvider::kDefaultColorToolbar =
@@ skipping 27 matching lines @@
 const skia::HSL BrowserThemeProvider::kDefaultTintFrameIncognito =
     { -1, 0.2f, 0.35f };
 const skia::HSL BrowserThemeProvider::kDefaultTintFrameIncognitoInactive =
     { -1, 0.3f, 0.6f };
 const skia::HSL BrowserThemeProvider::kDefaultTintBackgroundTab =
     { -1, 0.5, 0.75 };
 
 // Default display properties.
 static const int kDefaultDisplayPropertyNTPAlignment =
     BrowserThemeProvider::ALIGN_BOTTOM;
+static const int kDefaultDisplayPropertyNTPTiling =
+    BrowserThemeProvider::NO_REPEAT;
 
 // The image resources that will be tinted by the 'button' tint value.
 static const int kToolbarButtonIDs[] = {
   IDR_BACK, IDR_BACK_D, IDR_BACK_H, IDR_BACK_P,
   IDR_FORWARD, IDR_FORWARD_D, IDR_FORWARD_H, IDR_FORWARD_P,
   IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P,
   IDR_HOME, IDR_HOME_H, IDR_HOME_P,
   IDR_STAR, IDR_STAR_NOBORDER, IDR_STAR_D, IDR_STAR_H, IDR_STAR_P,
   IDR_STARRED, IDR_STARRED_NOBORDER, IDR_STARRED_H, IDR_STARRED_P,
   IDR_GO, IDR_GO_H, IDR_GO_P,
@@ skipping 126 matching lines @@
 bool BrowserThemeProvider::GetDisplayProperty(int id, int* result) {
   switch (id) {
     case NTP_BACKGROUND_ALIGNMENT:
       if (display_properties_.find(kDisplayPropertyNTPAlignment) !=
           display_properties_.end()) {
         *result = display_properties_[kDisplayPropertyNTPAlignment];
       } else {
         *result = kDefaultDisplayPropertyNTPAlignment;
       }
       return true;
+    case NTP_BACKGROUND_TILING:
+      if (display_properties_.find(kDisplayPropertyNTPTiling) !=
+          display_properties_.end()) {
+        *result = display_properties_[kDisplayPropertyNTPTiling];
+      } else {
+        *result = kDefaultDisplayPropertyNTPTiling;
+      }
+      return true;
     default:
       NOTREACHED() << "Unknown property requested";
   }
   return false;
 }
 
 bool BrowserThemeProvider::ShouldUseNativeFrame() {
   if (images_.find(IDR_THEME_FRAME) != images_.end())
     return false;
 #if defined(OS_WIN)
@@ skipping 223 matching lines @@
 
 void BrowserThemeProvider::SetDisplayPropertyData(
     DictionaryValue* display_properties_value) {
   display_properties_.clear();
 
   if (!display_properties_value)
     return;
 
   DictionaryValue::key_iterator iter = display_properties_value->begin_keys();
   while (iter != display_properties_value->end_keys()) {
-    // New tab page alignment.
+    // New tab page alignment and background tiling.
     if (base::strcasecmp(WideToUTF8(*iter).c_str(),
         kDisplayPropertyNTPAlignment) == 0) {
       std::string val;
       if (display_properties_value->GetString(*iter, &val))
         display_properties_[kDisplayPropertyNTPAlignment] =
             StringToAlignment(val);
+    } else if (base::strcasecmp(WideToUTF8(*iter).c_str(),
+               kDisplayPropertyNTPTiling) == 0) {
+      std::string val;
+      if (display_properties_value->GetString(*iter, &val))
+        display_properties_[kDisplayPropertyNTPTiling] =
+            StringToTiling(val);
     }
     ++iter;
   }
 }
 
 // static
 int BrowserThemeProvider::StringToAlignment(const std::string& alignment) {
   std::vector<std::wstring> split;
   SplitStringAlongWhitespace(UTF8ToWide(alignment), &split);
 
@@ skipping 34 matching lines @@
     horizontal_string = kAlignmentRight;
 
   if (!vertical_string.empty() && !horizontal_string.empty())
     return vertical_string + " " + horizontal_string;
   else if (vertical_string.empty())
     return horizontal_string;
   else
     return vertical_string;
 }
 
+// static
+int BrowserThemeProvider::StringToTiling(const std::string &tiling) {
+  const char* component = tiling.c_str();
+
+  if (base::strcasecmp(component, kTilingRepeatX) == 0)
+    return BrowserThemeProvider::REPEAT_X;
+  else if (base::strcasecmp(component, kTilingRepeatY) == 0)
+    return BrowserThemeProvider::REPEAT_Y;
+  else if (base::strcasecmp(component, kTilingRepeat) == 0)
+    return BrowserThemeProvider::REPEAT;
+  // NO_REPEAT is the default choice.
+  return BrowserThemeProvider::NO_REPEAT;
+}
+
+// static
+std::string BrowserThemeProvider::TilingToString(int tiling) {
+  // Convert from a TilingProperty back into a string.
+  if (tiling == BrowserThemeProvider::REPEAT_X)
+    return kTilingRepeatX;
+  else if (tiling == BrowserThemeProvider::REPEAT_Y)
+    return kTilingRepeatY;
+  else if (tiling == BrowserThemeProvider::REPEAT)
+    return kTilingRepeat;
+  else
+    return kTilingNoRepeat;
+}
+
 void BrowserThemeProvider::SetColor(const char* key, const SkColor& color) {
   colors_[key] = color;
 }
 
 void BrowserThemeProvider::SetTint(const char* key, const skia::HSL& tint) {
   tints_[key] = tint;
 }
 
 void BrowserThemeProvider::GenerateFrameColors() {
   // Generate any secondary frame colors that weren't provided.
@@ skipping 154 matching lines @@
   pref_display_properties->Clear();
 
   if (display_properties_.size()) {
     DisplayPropertyMap::iterator iter = display_properties_.begin();
     while (iter != display_properties_.end()) {
       if (base::strcasecmp((*iter).first.c_str(),
                            kDisplayPropertyNTPAlignment) == 0) {
         pref_display_properties->
             SetString(UTF8ToWide((*iter).first), AlignmentToString(
                 (*iter).second));
+      } else if (base::strcasecmp((*iter).first.c_str(),
+                                  kDisplayPropertyNTPTiling) == 0) {
+        pref_display_properties->
+            SetString(UTF8ToWide((*iter).first), TilingToString(
+                (*iter).second));
       }
       ++iter;
     }
   }
 }
 
 void BrowserThemeProvider::NotifyThemeChanged() {
   // Redraw!
   NotificationService* service = NotificationService::current();
   service->Notify(NotificationType::BROWSER_THEME_CHANGED,
@@ skipping 35 matching lines @@
     delete i->second;
   }
   image_cache_.clear();
 }
 
 #if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif