Merge 24709 - Fix theme caching on Vista 64 when default theme is installed f...

chrome/browser/browser_theme_provider.h

Index: chrome/browser/browser_theme_provider.h
===================================================================
--- chrome/browser/browser_theme_provider.h	(revision 24969)
+++ chrome/browser/browser_theme_provider.h	(working copy)
@@ -308,6 +308,9 @@
   // Encode image at image_cache_[id] as PNG and write to disk.
   void WriteImagesToDisk();
 
+  // Do we have a custom frame image or custom tints?
+  bool ShouldTintFrames();
+
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   // Loads an image and flips it horizontally if |rtl_enabled| is true.
   GdkPixbuf* GetPixbufImpl(int id, bool rtl_enabled);
Property changes on: chrome\browser\browser_theme_provider.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser_theme_provider.h:r24709