Make the DOMUIThemeSource load and pass through a PNG, rather than relying on...

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 335 matching lines @@
 #endif
 }
 
 bool BrowserThemeProvider::HasCustomImage(int id) {
   if (!themeable_images_[id])
     return false;
 
   return (images_.find(id) != images_.end());
 }
 
+bool BrowserThemeProvider::GetRawData(int id,
+                                      std::vector<unsigned char>* raw_data) {
+  if (raw_data_.find(id) != raw_data_.end()) {
+    *raw_data = raw_data_[id];
+    return true;
+  }
+
+  if (!ReadThemeFileData(id, raw_data)) {
+    if (!rb_.LoadImageResourceBytes(id, raw_data))
+      return false;
+  }
+
+  raw_data_[id] = *raw_data;
+  return true;
+}
+
 void BrowserThemeProvider::SetTheme(Extension* extension) {
   // Clear our image cache.
   ClearCaches();
 
   DCHECK(extension);
   DCHECK(extension->IsTheme());
   SetImageData(extension->GetThemeImages(),
                extension->path());
   SetColorData(extension->GetThemeColors());
   SetTintData(extension->GetThemeTints());
   SetDisplayPropertyData(extension->GetThemeDisplayProperties());
+  raw_data_.clear();
   GenerateFrameColors();
   GenerateFrameImages();
   GenerateTabImages();
 
   SaveImageData(extension->GetThemeImages());
   SaveColorData();
   SaveTintData();
   SaveDisplayPropertyData();
   SaveThemeID(extension->id());
 
@@ skipping 396 matching lines @@
 }
 
 void BrowserThemeProvider::ClearAllThemeData() {
   // Clear our image cache.
   ClearCaches();
 
   images_.clear();
   colors_.clear();
   tints_.clear();
   display_properties_.clear();
+  raw_data_.clear();
 
   SaveImageData(NULL);
   SaveColorData();
   SaveTintData();
   SaveDisplayPropertyData();
   SaveThemeID(kDefaultThemeID);
 }
 
 SkBitmap* BrowserThemeProvider::GenerateBitmap(int id) {
   if (id == IDR_THEME_TAB_BACKGROUND ||
@@ skipping 169 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