Merge app/gfx/gtk_util into base/gfx/gtk_util.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/118174

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

4 files changed, 0 insertions, 65 deletions

diff --git a/app/app.gyp b/app/app.gyp
index 4a4c29b..3d1d0a5 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -77,8 +77,6 @@
         'gfx/color_utils.cc',
         'gfx/color_utils.h',
         'gfx/favicon_size.h',
-        'gfx/gtk_util.cc',
-        'gfx/gtk_util.h',
         'gfx/icon_util.cc',
         'gfx/icon_util.h',
         'gfx/insets.h',
diff --git a/app/gfx/gtk_util.cc b/app/gfx/gtk_util.cc
deleted file mode 100644
index e2c5ba4..0000000
--- a/app/gfx/gtk_util.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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 "app/gfx/gtk_util.h"
-
-#include "base/linux_util.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-
-namespace {
-
-void FreePixels(guchar* pixels, gpointer data) {
-  free(data);
-}
-
-}  // namespace
-
-namespace gfx {
-
-GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap) {
-  bitmap->lockPixels();
-  int width = bitmap->width();
-  int height = bitmap->height();
-  int stride = bitmap->rowBytes();
-  const guchar* orig_data = static_cast<guchar*>(bitmap->getPixels());
-  guchar* data = base::BGRAToRGBA(orig_data, width, height, stride);
-
-  // This pixbuf takes ownership of our malloc()ed data and will
-  // free it for us when it is destroyed.
-  GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
-      data,
-      GDK_COLORSPACE_RGB,  // The only colorspace gtk supports.
-      true,  // There is an alpha channel.
-      8,
-      width, height, stride, &FreePixels, data);
-
-  bitmap->unlockPixels();
-  return pixbuf;
-}
-
-}  // namespace gfx
diff --git a/app/gfx/gtk_util.h b/app/gfx/gtk_util.h
deleted file mode 100644
index 471d7f2..0000000
--- a/app/gfx/gtk_util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.
-
-#ifndef APP_GFX_GTK_UTIL_H_
-#define APP_GFX_GTK_UTIL_H_
-
-#include <gtk/gtk.h>
-
-typedef struct _GdkPixbuf GdkPixbuf;
-class SkBitmap;
-
-namespace gfx {
-
-// Convert and copy a SkBitmap to a GdkPixbuf. NOTE: this uses BGRAToRGBA, so
-// it is an expensive operation.
-GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap);
-
-}  // namespace gfx
-
-#endif  // APP_GFX_GTK_UTIL_H_
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index e27c7b6..f886eca 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -8,7 +8,6 @@
 
 #include "app/app_paths.h"
 #include "app/gfx/font.h"
-#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/data_pack.h"