Merge 22462 - Use the theme ID as as the cachebuster, making subsequent NNTP ...

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"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/theme_resources_util.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/views/bookmark_bar_view.h"
 #endif
 
@@ skipping 80 matching lines @@
   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()))));  // $1
+  subst.push_back(WideToUTF16(
+      profile_->GetPrefs()->GetString(prefs::kCurrentThemeID)));  // $1
 
   // Colors.
   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
@@ skipping 70 matching lines @@
   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);
 }