Integrate gfx::Image into the ResourceBundle.

ui/gfx/image.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_GFX_IMAGE_H_
 #define UI_GFX_IMAGE_H_
 #pragma once
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "ui/gfx/native_widget_types.h"  // Forward-declares GdkPixbuf and NSImage.
-#include "third_party/skia/include/core/SkBitmap.h"
+
+class SkBitmap;
 
 namespace {
 class ImageTest;
 }
 
 namespace gfx {
 
 namespace internal {
 class ImageRep;
 }
@@ skipping 13 matching lines @@
     kSkBitmapRep,
   };
 
   // Creates a new image with the default representation. The object will take
   // ownership of the image.
   explicit Image(const SkBitmap* bitmap);
 #if defined(OS_LINUX)
   // Does not increase |pixbuf|'s reference count.
   explicit Image(GdkPixbuf* pixbuf);
 #elif defined(OS_MACOSX)
   // Does not retain |image|.

[TVL, 2011/02/18 21:19:12]

i'd tweak this, it's not that it does't retain, it assumes ownership because it
does release it.

[Robert Sesek, 2011/02/18 21:48:17]

Done.

   explicit Image(NSImage* image);
 #endif
 
   // Deletes the image and all of its cached representations.
   ~Image();
 
   // Conversion handlers.
   operator const SkBitmap*();
   operator const SkBitmap&();
 #if defined(OS_LINUX)
@@ skipping 23 matching lines @@
   // All the representations of an Image. Size will always be at least one, with
   // more for any converted representations.
   RepresentationMap representations_;
 
   DISALLOW_COPY_AND_ASSIGN(Image);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_H_