Reverting 16122.

Review URL: http://codereview.chromium.org/113427

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16124 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 3 deletions

diff --git a/chrome/common/gtk_util.h b/chrome/common/gtk_util.h
index 9a94182..ff3dc5c 100644
--- a/chrome/common/gtk_util.h
+++ b/chrome/common/gtk_util.h
@@ -9,7 +9,9 @@
 
 #include "webkit/glue/window_open_disposition.h"
 
+typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkWidget GtkWidget;
+class SkBitmap;
 
 namespace event_utils {
 
@@ -20,9 +22,13 @@ WindowOpenDisposition DispositionFromEventFlags(guint state);
 
 }  // namespace event_utils
 
-namespace gtk_util {
+namespace gfx {
 
-  // Create a GtkBin with |child| as its child widget.  This bin will paint a
+// Convert and copy a SkBitmap to a GdkPixbuf. NOTE: this uses BGRAToRGBA, so
+// it is an expensive operation.
+GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap);
+
+// Create a GtkBin with |child| as its child widget.  This bin will paint a
 // border of color |color| with the sizes specified in pixels.
 GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
                               int top, int bottom, int left, int right);
@@ -30,6 +36,6 @@ GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
 // Remove all children from this container.
 void RemoveAllChildren(GtkWidget* container);
 
-}  // namespace gtk_util
+}  // namespace gfx
 
 #endif  // CHROME_COMMON_GTK_UTIL_H_