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

Unified Diff: chrome/browser/importer/importer.cc

Issue 159668: First cut at Safari Import - Home Page & History Only. (Closed)
Patch Set: Fix Stuart's comments. Created 11 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
Index: chrome/browser/importer/importer.cc
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index df32899eda0f51f7c817293f26e5c39e5683c34b..904361a787b8eba77010b84eb1de42ca8b992067 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -14,6 +14,7 @@
#endif
#include "base/file_util.h"
#include "base/gfx/png_encoder.h"
+#include "base/mac_util.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -28,6 +29,9 @@
#if defined(OS_WIN)
#include "chrome/browser/importer/ie_importer.h"
#endif
+#if defined(OS_MACOSX)
+#include "chrome/browser/importer/safari_importer.h"
+#endif
#include "chrome/browser/importer/toolbar_importer.h"
#if defined(OS_WIN)
#include "chrome/browser/password_manager/ie7_password.h"
@@ -652,9 +656,7 @@ Importer* ImporterHost::CreateImporterByType(ProfileType type) {
return new Toolbar5Importer();
#if defined(OS_MACOSX)
case SAFARI:
- // TODO(jeremy): Implement.
- NOTIMPLEMENTED();
- return NULL;
+ return new SafariImporter(mac_util::GetUserLibraryPath());
#endif // OS_MACOSX
}
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698