summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 16:42:13 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-19 16:42:13 +0000
commite57b0db08bc0f73d4f42f485ea1ed9070969c18f (patch)
tree10a3187bae462c9d2926c85e828303ce76f79f4b /chrome/browser/importer
parentd9c320a8f7ff01a475a831924797001f54443a85 (diff)
downloadchromium_src-e57b0db08bc0f73d4f42f485ea1ed9070969c18f.zip
chromium_src-e57b0db08bc0f73d4f42f485ea1ed9070969c18f.tar.gz
chromium_src-e57b0db08bc0f73d4f42f485ea1ed9070969c18f.tar.bz2
Move data types used in the importer process to common/, in preparation for import to run out of process.
BUG= 18774 TEST= none. Review URL: http://codereview.chromium.org/2106015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/firefox2_importer.h2
-rw-r--r--chrome/browser/importer/firefox3_importer.h2
-rw-r--r--chrome/browser/importer/ie_importer.cc2
-rw-r--r--chrome/browser/importer/importer.h2
-rw-r--r--chrome/browser/importer/importer_bridge.h2
-rw-r--r--chrome/browser/importer/importer_data_types.h58
-rw-r--r--chrome/browser/importer/importer_list.h5
-rw-r--r--chrome/browser/importer/importer_unittest.cc2
-rw-r--r--chrome/browser/importer/safari_importer.h2
-rw-r--r--chrome/browser/importer/toolbar_importer.h2
10 files changed, 11 insertions, 68 deletions
diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index 09a80d7..1eebd4a 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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 f8bfa2f..bf921b7 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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 cae26ba..1cc3dc0 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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 d0ea428..50b7a4d 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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 14025e6..8f90e61 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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
deleted file mode 100644
index 444cc45..0000000
--- a/chrome/browser/importer/importer_data_types.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// 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 156e12e..3557043 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/browser/importer/importer_data_types.h"
+#include "chrome/common/importer_data_types.h"
class Importer;
@@ -38,7 +38,8 @@ class ImporterList {
const importer::ProfileInfo& GetSourceProfileInfoAt(int index) const;
// Returns the ProfileInfo with the given browser type.
- const importer::ProfileInfo& GetSourceProfileInfoForBrowserType(int browser_type) const;
+ const importer::ProfileInfo& GetSourceProfileInfoForBrowserType(
+ int browser_type) const;
// Helper methods for detecting available profiles.
#if defined(OS_WIN)
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index eac9bed..eaa4dc6 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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 c15ca30..5465efd 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/browser/importer/importer_data_types.h"
+#include "chrome/common/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 23f4291..0e13118 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/browser/importer/importer_data_types.h"
+#include "chrome/common/importer_data_types.h"
#include "chrome/common/net/url_fetcher.h"
#include "testing/gtest/include/gtest/gtest_prod.h"
generated by cgit v1.1 at 2025-03-30 11:25:46 +0000