Move convolver, image_operations, and skia_utils from base/gfx to skia/ext....

chrome/browser/importer/importer.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/importer/importer.h"
 
 #include <map>
 #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"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox3_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/importer/toolbar_importer.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #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"
 
 // ProfileWriter.
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
   return profile_->GetBookmarkModel()->IsLoaded();
 }
 
@@ skipping 333 matching lines @@
   webkit_glue::ImageDecoder decoder(gfx::Size(kFavIconSize, kFavIconSize));
   SkBitmap decoded = decoder.Decode(src_data, src_len);
   if (decoded.empty())
     return false;  // Unable to decode.
 
   if (decoded.width() != kFavIconSize || decoded.height() != kFavIconSize) {
     // The bitmap is not the correct size, re-sample.
     int new_width = decoded.width();
     int new_height = decoded.height();
     calc_favicon_target_size(&new_width, &new_height);
-    decoded = gfx::ImageOperations::Resize(
-        decoded, gfx::ImageOperations::RESIZE_LANCZOS3,
+    decoded = skia::ImageOperations::Resize(
+        decoded, skia::ImageOperations::RESIZE_LANCZOS3,
         gfx::Size(new_width, new_height));
   }
 
   // Encode our bitmap as a PNG.
   SkAutoLockPixels decoded_lock(decoded);
   PNGEncoder::Encode(reinterpret_cast<unsigned char*>(decoded.getPixels()),
                      PNGEncoder::FORMAT_BGRA, decoded.width(),
                      decoded.height(), decoded.width() * 4, false, png_data);
   return true;
 }
@@ skipping 310 matching lines @@
     ProfileInfo* google_toolbar = new ProfileInfo();
     google_toolbar->browser_type = GOOGLE_TOOLBAR5;
     google_toolbar->description = l10n_util::GetString(
                                   IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
     google_toolbar->source_path.clear();
     google_toolbar->app_path.clear();
     google_toolbar->services_supported = FAVORITES;
     source_profiles_.push_back(google_toolbar);
   }
 }