Add GetImageSkiaNamed to resource_bundle and theme_provider

ui/base/theme_provider.h

 // Copyright (c) 2012 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_BASE_THEME_PROVIDER_H_
 #define UI_BASE_THEME_PROVIDER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 13 matching lines @@
 typedef struct _GdkColor GdkColor;
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif  // OS_*
 
 class SkBitmap;
 
 namespace base {
 class RefCountedMemory;
 }
 
+namespace gfx {
+class ImageSkia;
+}
+
 namespace ui {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ThemeProvider
 //
 //   ThemeProvider is an abstract class that defines the API that should be
 //   implemented to provide bitmaps and color information for a given theme.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class UI_EXPORT ThemeProvider {
  public:
   virtual ~ThemeProvider();
 
   // Get the bitmap specified by |id|. An implementation of ThemeProvider should
   // have its own source of ids (e.g. an enum, or external resource bundle).
+  // TODO(pkotwicz): Get rid of GetBitmapNamed once all code uses
+  // GetImageSkiaNamed.
   virtual SkBitmap* GetBitmapNamed(int id) const = 0;
 
+  // Get the image specified by |id|. An implementation of ThemeProvider should
+  // have its own source of ids (e.g. an enum, or external resource bundle).
+  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const = 0;
+
   // Get the color specified by |id|.
   virtual SkColor GetColor(int id) const = 0;
 
   // Get the property (e.g. an alignment expressed in an enum, or a width or
   // height) specified by |id|.
   virtual bool GetDisplayProperty(int id, int* result) const = 0;
 
   // Whether we should use the native system frame (typically Aero glass) or
   // a custom frame.
   virtual bool ShouldUseNativeFrame() const = 0;
@@ skipping 46 matching lines @@
   // is missing.
 
   // As above, but flips it in RTL locales.
   virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const = 0;
 #endif
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_THEME_PROVIDER_H_