summaryrefslogtreecommitdiffstats
path: root/chrome/browser/icon_loader_linux.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 01:08:24 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 01:08:24 +0000
commit0996997dcdeb39892665ce5ee7ae773ab2e729e3 (patch)
tree42cb5670877914ba66115fcd31ae42e57c9cd686 /chrome/browser/icon_loader_linux.cc
parent4346168703bc2f3879669e1b969628ed62a266d2 (diff)
downloadchromium_src-0996997dcdeb39892665ce5ee7ae773ab2e729e3.zip
chromium_src-0996997dcdeb39892665ce5ee7ae773ab2e729e3.tar.gz
chromium_src-0996997dcdeb39892665ce5ee7ae773ab2e729e3.tar.bz2
Cleanup: Remove base/gtk_util.h by moving its methods to
gfx/gtk_util.h BUG=none TEST=none Review URL: http://codereview.chromium.org/4150006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader_linux.cc')
-rw-r--r--chrome/browser/icon_loader_linux.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc
index 1f8eff2..a4cf378 100644
--- a/chrome/browser/icon_loader_linux.cc
+++ b/chrome/browser/icon_loader_linux.cc
@@ -9,13 +9,13 @@
#include <gtk/gtk.h>
#include "base/file_util.h"
-#include "base/gtk_util.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/mime_util.h"
#include "base/thread.h"
#include "base/string_util.h"
#include "gfx/codec/png_codec.h"
+#include "gfx/gtk_util.h"
#include "third_party/skia/include/core/SkBitmap.h"
static int SizeToInt(IconLoader::IconSize size) {
@@ -61,7 +61,7 @@ void IconLoader::ParseIcon() {
LOG(WARNING) << "Got an image with no alpha channel, aborting load.";
} else {
uint8_t* BGRA_pixels =
- gtk_util::BGRAToRGBA(pixels, width, height, stride);
+ gfx::BGRAToRGBA(pixels, width, height, stride);
std::vector<unsigned char> pixel_vector;
pixel_vector.resize(height * stride);
memcpy(const_cast<unsigned char*>(pixel_vector.data()), BGRA_pixels,