summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/firefox2_importer.h1
-rw-r--r--chrome/browser/importer/ie_importer.h3
-rw-r--r--chrome/browser/importer/safari_importer.h1
-rw-r--r--chrome/browser/importer/safari_importer.mm2
-rw-r--r--chrome/browser/importer/toolbar_importer.cc3
-rw-r--r--chrome/browser/importer/toolbar_importer.h3
6 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h
index d9aa263..d517ee3 100644
--- a/chrome/browser/importer/firefox2_importer.h
+++ b/chrome/browser/importer/firefox2_importer.h
@@ -113,7 +113,6 @@ class Firefox2Importer : public Importer {
const GURL& favicon_data,
std::vector<history::ImportedFavIconUsage>* favicons);
- ProfileWriter* writer_;
std::wstring source_path_;
std::wstring app_path_;
// If true, we only parse the bookmarks.html file specified as source_path_.
diff --git a/chrome/browser/importer/ie_importer.h b/chrome/browser/importer/ie_importer.h
index a43b660..f40d439e 100644
--- a/chrome/browser/importer/ie_importer.h
+++ b/chrome/browser/importer/ie_importer.h
@@ -59,9 +59,6 @@ class IEImporter : public Importer {
// Determines which version of IE is in use.
int CurrentIEVersion() const;
- // Hosts the writer used in this importer.
- ProfileWriter* writer_;
-
// IE PStore subkey GUID: AutoComplete password & form data.
static const GUID kPStoreAutocompleteGUID;
diff --git a/chrome/browser/importer/safari_importer.h b/chrome/browser/importer/safari_importer.h
index 827880f..25f63f8 100644
--- a/chrome/browser/importer/safari_importer.h
+++ b/chrome/browser/importer/safari_importer.h
@@ -89,7 +89,6 @@ class SafariImporter : public Importer {
const FaviconMap& favicon_map,
std::vector<history::ImportedFavIconUsage>* favicons);
- ProfileWriter* writer_;
FilePath library_dir_;
DISALLOW_COPY_AND_ASSIGN(SafariImporter);
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm
index bcf3432..54a6d2a 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/browser/importer/safari_importer.mm
@@ -40,7 +40,7 @@ bool CanImportSafariURL(const GURL& url) {
} // namespace
SafariImporter::SafariImporter(const FilePath& library_dir)
- : writer_(NULL), library_dir_(library_dir) {
+ : library_dir_(library_dir) {
}
SafariImporter::~SafariImporter() {
diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc
index a215fd8..669abab 100644
--- a/chrome/browser/importer/toolbar_importer.cc
+++ b/chrome/browser/importer/toolbar_importer.cc
@@ -74,8 +74,7 @@ const char Toolbar5Importer::kT5FrontEndUrlTemplate[] =
// The constructor should set the initial state to NOT_USED.
Toolbar5Importer::Toolbar5Importer()
- : writer_(NULL),
- state_(NOT_USED),
+ : state_(NOT_USED),
items_to_import_(NONE),
token_fetcher_(NULL),
data_fetcher_(NULL) {
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 61cdfb0..e2cf511 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -148,9 +148,6 @@ class Toolbar5Importer : public URLFetcher::Delegate, public Importer {
void AddBookmarksToChrome(
const std::vector<ProfileWriter::BookmarkEntry>& bookmarks);
- // The writer used in this importer is stored in writer_.
- ProfileWriter* writer_;
-
// Internal state is stored in state_.
InternalStateEnum state_;