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

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

Issue 18501013: Move most importer code to chrome/utility/importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix include on mac 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
Index: chrome/browser/importer/importer_list.cc
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
index 7c9df719871de1080477ed60bfdaf4178320dfe0..f9ecd67c1d3911de58f9b9b24117ee832e362043 100644
--- a/chrome/browser/importer/importer_list.cc
+++ b/chrome/browser/importer/importer_list.cc
@@ -5,10 +5,10 @@
#include "chrome/browser/importer/importer_list.h"
#include "base/bind.h"
-#include "chrome/browser/importer/firefox_importer_utils.h"
-#include "chrome/browser/importer/importer_bridge.h"
#include "chrome/browser/importer/importer_list_observer.h"
#include "chrome/browser/shell_integration.h"
+#include "chrome/common/importer/firefox_importer_utils.h"
+#include "chrome/common/importer/importer_bridge.h"
#include "chrome/common/importer/importer_data_types.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -17,7 +17,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include "base/mac/foundation_util.h"
-#include "chrome/browser/importer/safari_importer.h"
+#include "chrome/utility/importer/safari_importer.h"
#endif
using content::BrowserThread;
@@ -41,7 +41,7 @@ void DetectIEProfiles(std::vector<importer::SourceProfile*>* profiles) {
#if defined(OS_MACOSX)
void DetectSafariProfiles(std::vector<importer::SourceProfile*>* profiles) {
uint16 items = importer::NONE;
- if (!SafariImporter::CanImport(base::mac::GetUserLibraryPath(), &items))
+ if (!SafariImporterCanImport(base::mac::GetUserLibraryPath(), &items))
return;
importer::SourceProfile* safari = new importer::SourceProfile;

Powered by Google App Engine
This is Rietveld 408576698