summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 22:06:01 +0000
committerpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 22:06:01 +0000
commit7cd70c394eeaeb6a93a8e28142942b5584f01e2d (patch)
tree4a3bde2aefad49928afe234d0d48154370ecbfc5 /chrome
parent42b206a6890ec008ed2729b36a5a58f0f334b3be (diff)
downloadchromium_src-7cd70c394eeaeb6a93a8e28142942b5584f01e2d.zip
chromium_src-7cd70c394eeaeb6a93a8e28142942b5584f01e2d.tar.gz
chromium_src-7cd70c394eeaeb6a93a8e28142942b5584f01e2d.tar.bz2
Move non-linux specific code from base/linux_util to app/gtk_util
from sprewell Review URL: http://codereview.chromium.org/2058004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/icon_loader_linux.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc
index 4a685ee..de26857 100644
--- a/chrome/browser/icon_loader_linux.cc
+++ b/chrome/browser/icon_loader_linux.cc
@@ -10,7 +10,7 @@
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/linux_util.h"
+#include "app/gtk_util.h"
#include "base/message_loop.h"
#include "base/mime_util.h"
#include "base/thread.h"
@@ -60,7 +60,8 @@ void IconLoader::ParseIcon() {
if (!gdk_pixbuf_get_has_alpha(pixbuf)) {
LOG(WARNING) << "Got an image with no alpha channel, aborting load.";
} else {
- uint8_t* BGRA_pixels = base::BGRAToRGBA(pixels, width, height, stride);
+ uint8_t* BGRA_pixels =
+ gtk_util::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,