Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Unified Diff: chrome/utility/importer/safari_importer.mm

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another gyp attempt Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/utility/importer/safari_importer.h ('k') | chrome/utility/importer/safari_importer_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/safari_importer.mm
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm
similarity index 98%
rename from chrome/browser/importer/safari_importer.mm
rename to chrome/utility/importer/safari_importer.mm
index 4a5de0dba616fceaab1159d65de88af3612ba0d4..8740742e7fe31486880907a58c05435e4550c5ee 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/utility/importer/safari_importer.mm
@@ -4,7 +4,7 @@
#include <Cocoa/Cocoa.h>
-#include "chrome/browser/importer/safari_importer.h"
+#include "chrome/utility/importer/safari_importer.h"
#include <map>
#include <vector>
@@ -15,11 +15,11 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
-#include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/browser/importer/reencode_favicon.h"
#include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/common/importer/imported_favicon_usage.h"
+#include "chrome/common/importer/importer_bridge.h"
#include "chrome/common/url_constants.h"
+#include "chrome/utility/importer/favicon_reencode.h"
#include "grit/generated_resources.h"
#include "net/base/data_url.h"
#include "sql/statement.h"
@@ -176,7 +176,7 @@ void SafariImporter::LoadFaviconData(
if (data.empty())
continue; // Data definitely invalid.
- if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data))
+ if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
continue; // Unable to decode.
usage.urls = i->second;
« no previous file with comments | « chrome/utility/importer/safari_importer.h ('k') | chrome/utility/importer/safari_importer_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698