10 files changed, 67 insertions, 9 deletions
diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index 1eebd4a..09a80d7 100644
--- a/chrome/browser/importer/firefox2_importer.h
+++ b/chrome/browser/importer/firefox2_importer.h
@@ -9,7 +9,7 @@
 
 #include "base/file_path.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class TemplateURL;
diff --git a/chrome/browser/importer/firefox3_importer.h b/chrome/browser/importer/firefox3_importer.h
index bf921b7..f8bfa2f 100644
--- a/chrome/browser/importer/firefox3_importer.h
+++ b/chrome/browser/importer/firefox3_importer.h
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "googleurl/src/gurl.h"
 
 struct sqlite3;
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 1cc3dc0..cae26ba 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -26,7 +26,7 @@
 #include "base/win_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h
index 50b7a4d..d0ea428 100644
--- a/chrome/browser/importer/importer.h
+++ b/chrome/browser/importer/importer.h
@@ -15,7 +15,7 @@
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/profile_writer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/importer/importer_bridge.h b/chrome/browser/importer/importer_bridge.h
index 8f90e61..14025e6 100644
--- a/chrome/browser/importer/importer_bridge.h
+++ b/chrome/browser/importer/importer_bridge.h
@@ -13,7 +13,7 @@
 #include "base/string16.h"
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 // TODO: remove this, see friend declaration in ImporterBridge.
 #include "chrome/browser/importer/toolbar_importer.h"
 
diff --git a/chrome/browser/importer/importer_data_types.h b/chrome/browser/importer/importer_data_types.h
new file mode 100644
index 0000000..444cc45
--- /dev/null
+++ b/chrome/browser/importer/importer_data_types.h
@@ -0,0 +1,58 @@
+// Copyright (c) 2010 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.
+
+#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_
+#define CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/file_path.h"
+
+// Types needed for importing data from other browsers and the Google
+// Toolbar.
+namespace importer {
+
+// An enumeration of the type of data that can be imported.
+enum ImportItem {
+  NONE           = 0,
+  HISTORY        = 1 << 0,
+  FAVORITES      = 1 << 1,
+  COOKIES        = 1 << 2,  // Not supported yet.
+  PASSWORDS      = 1 << 3,
+  SEARCH_ENGINES = 1 << 4,
+  HOME_PAGE      = 1 << 5,
+  ALL            = (1 << 6) - 1  // All the bits should be 1, hence the -1.
+};
+
+// An enumeration of the type of browsers that we support to import
+// settings and data from them.  Numbers added so that data can be
+// reliably cast to ints and passed across IPC.
+enum ProfileType {
+#if defined(OS_WIN)
+  MS_IE = 0,
+#endif
+  FIREFOX2 = 1,
+  FIREFOX3 = 2,
+#if defined(OS_MACOSX)
+  SAFARI = 3,
+#endif
+  GOOGLE_TOOLBAR5 = 4,
+  // Identifies a 'bookmarks.html' file.
+  BOOKMARKS_HTML = 5
+};
+
+// Information about a profile needed by an importer to do import work.
+struct ProfileInfo {
+  std::wstring description;
+  importer::ProfileType browser_type;
+  FilePath source_path;
+  FilePath app_path;
+  uint16 services_supported;  // Bitmask of ImportItem.
+};
+
+}  // namespace importer
+
+#endif  // CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_
+
diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h
index 3557043..c76aab3 100644
--- a/chrome/browser/importer/importer_list.h
+++ b/chrome/browser/importer/importer_list.h
@@ -10,7 +10,7 @@
 
 #include "build/build_config.h"
 #include "base/basictypes.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 
 class Importer;
 
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index eaa4dc6..eac9bed 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
diff --git a/chrome/browser/importer/safari_importer.h b/chrome/browser/importer/safari_importer.h
index 5465efd..c15ca30 100644
--- a/chrome/browser/importer/safari_importer.h
+++ b/chrome/browser/importer/safari_importer.h
@@ -13,7 +13,7 @@
 
 #include "base/file_path.h"
 #include "chrome/common/sqlite_utils.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 #if __OBJC__
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 0e13118..23f4291 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "chrome/browser/importer/importer.h"
-#include "chrome/common/importer_data_types.h"
+#include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"