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

app/resource_bundle.cc

 // Copyright (c) 2006-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 "app/resource_bundle.h"
 
+#include "app/gfx/codec/png_codec.h"
 #include "app/gfx/font.h"
-#include "base/gfx/png_decoder.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 
 /* static */
 // TODO(glen): Finish moving these into theme provider (dialogs still
@@ skipping 54 matching lines @@
   bool success = false;
 
   if (!success)
     success = LoadResourceBytes(data_handle, resource_id, &raw_data);
   if (!success)
     return NULL;
 
   // Decode the PNG.
   int image_width;
   int image_height;
-  if (!PNGDecoder::Decode(&raw_data.front(), raw_data.size(),
-                          PNGDecoder::FORMAT_BGRA,
-                          &png_data, &image_width, &image_height)) {
+  if (!gfx::PNGCodec::Decode(&raw_data.front(), raw_data.size(),
+                             gfx::PNGCodec::FORMAT_BGRA,
+                             &png_data, &image_width, &image_height)) {
     NOTREACHED() << "Unable to decode image resource " << resource_id;
     return NULL;
   }
 
-  return PNGDecoder::CreateSkBitmapFromBGRAFormat(png_data,
-                                                  image_width,
-                                                  image_height);
+  return gfx::PNGCodec::CreateSkBitmapFromBGRAFormat(png_data,
+                                                     image_width,
+                                                     image_height);
 }
 
 std::string ResourceBundle::GetDataResource(int resource_id) {
   return GetRawDataResource(resource_id).as_string();
 }
 
 bool ResourceBundle::LoadImageResourceBytes(int resource_id,
                                             std::vector<unsigned char>* bytes) {
   return LoadResourceBytes(theme_data_, resource_id, bytes);
 }
@@ skipping 90 matching lines @@
     case MediumFont:
       return *medium_font_;
     case MediumBoldFont:
       return *medium_bold_font_;
     case LargeFont:
       return *large_font_;
     default:
       return *base_font_;
   }
 }