Move the JPEG and PNG codecs from base/gfx to app/gfx/codec. Move the classes...

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 "app/gfx/codec/png_codec.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "base/file_util.h"
-#include "base/gfx/png_decoder.h"
-#include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/theme_resources_util.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 197 matching lines @@
     BrowserThemeProvider::ImagesDiskCache::const_iterator iter;
     for (iter = images_disk_cache_.begin();
          iter != images_disk_cache_.end();
          iter++) {
       FilePath image_path = (*iter).first;
       BrowserThemeProvider::ImageCache::const_iterator found =
           themed_image_cache_.find((*iter).second);
       if (found != themed_image_cache_.end()) {
         SkBitmap* bitmap = found->second;
         std::vector<unsigned char> image_data;
-        if (!PNGEncoder::EncodeBGRASkBitmap(*bitmap, false, &image_data)) {
+        if (!gfx::PNGCodec::EncodeBGRASkBitmap(*bitmap, false, &image_data)) {
           NOTREACHED() << "Image file could not be encoded.";
           return;
         }
         const char* image_data_ptr =
             reinterpret_cast<const char*>(&image_data[0]);
         if (!file_util::WriteFile(image_path,
             image_data_ptr, image_data.size())) {
           NOTREACHED() << "Image file could not be written to disk.";
           return;
         }
@@ skipping 404 matching lines @@
   if (!themeable_images_[id])
     return NULL;
 
   // Attempt to find the image in our theme bundle.
   std::vector<unsigned char> raw_data, png_data;
   if (ReadThemeFileData(id, &raw_data)) {
     // Decode the PNG.
     int image_width = 0;
     int image_height = 0;
 
-    if (!PNGDecoder::Decode(&raw_data.front(), raw_data.size(),
-        PNGDecoder::FORMAT_BGRA, &png_data,
+    if (!gfx::PNGCodec::Decode(&raw_data.front(), raw_data.size(),
+        gfx::PNGCodec::FORMAT_BGRA, &png_data,
         &image_width, &image_height)) {
       NOTREACHED() << "Unable to decode theme image resource " << id;
       return NULL;
     }
 
-    return PNGDecoder::CreateSkBitmapFromBGRAFormat(png_data,
-                                                    image_width,
-                                                    image_height);
+    return gfx::PNGCodec::CreateSkBitmapFromBGRAFormat(png_data,
+                                                       image_width,
+                                                       image_height);
   } else {
     // TODO(glen): File no-longer exists, we're out of date. We should
     // clear the theme (or maybe just the pref that points to this
     // image).
     return NULL;
   }
 }
 
 void BrowserThemeProvider::SaveThemeBitmap(
     std::string resource_name, int id) {
@@ skipping 617 matching lines @@
   }
   image_cache_.clear();
   images_disk_cache_.clear();
 }
 
 #if defined(OS_WIN)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif