summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer/importer.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 01:11:58 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 01:11:58 +0000
commitae615162135445eb0b94365b1a1cfa511e7f4be4 (patch)
treea32c9ad049aa25b3c40038713d546c3521d3d20e /chrome/browser/importer/importer.cc
parent693f8e4af78b0bb38cb56cd913c8774c75b43067 (diff)
downloadchromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.zip
chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.tar.gz
chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.tar.bz2
Revert my skia file moves because of layout test failures.
Review URL: http://codereview.chromium.org/12892 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/importer.cc')
-rw-r--r--chrome/browser/importer/importer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index a329cfb..3ce8996 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -8,6 +8,7 @@
#include <set>
#include "base/file_util.h"
+#include "base/gfx/image_operations.h"
#include "base/gfx/png_encoder.h"
#include "base/string_util.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -30,7 +31,6 @@
#include "chrome/common/pref_service.h"
#include "chrome/common/win_util.h"
#include "chrome/views/window.h"
-#include "skia/ext/image_operations.h"
#include "webkit/glue/image_decoder.h"
#include "generated_resources.h"
@@ -384,8 +384,8 @@ bool Importer::ReencodeFavicon(const unsigned char* src_data, size_t src_len,
int new_width = decoded.width();
int new_height = decoded.height();
calc_favicon_target_size(&new_width, &new_height);
- decoded = skia::ImageOperations::Resize(
- decoded, skia::ImageOperations::RESIZE_LANCZOS3,
+ decoded = gfx::ImageOperations::Resize(
+ decoded, gfx::ImageOperations::RESIZE_LANCZOS3,
gfx::Size(new_width, new_height));
}