summaryrefslogtreecommitdiffstats
path: root/chrome/profile_import
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/profile_import')
-rw-r--r--chrome/profile_import/profile_import_thread.cc9
-rw-r--r--chrome/profile_import/profile_import_thread.h6
2 files changed, 5 insertions, 10 deletions
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index 2472974..d98a2b0 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -54,8 +54,7 @@ bool ProfileImportThread::OnControlMessageReceived(const IPC::Message& msg) {
void ProfileImportThread::OnImportStart(
const importer::SourceProfile& source_profile,
uint16 items,
- const DictionaryValue& localized_strings,
- bool import_to_bookmark_bar) {
+ const DictionaryValue& localized_strings) {
bridge_ = new ExternalProcessImporterBridge(this, localized_strings);
importer_ = importer::CreateImporterByType(source_profile.importer_type);
if (!importer_) {
@@ -64,7 +63,6 @@ void ProfileImportThread::OnImportStart(
return;
}
- importer_->set_import_to_bookmark_bar(import_to_bookmark_bar);
items_to_import_ = items;
// Create worker thread in which importer runs.
@@ -137,10 +135,9 @@ void ProfileImportThread::NotifyHomePageImportReady(
void ProfileImportThread::NotifyBookmarksImportReady(
const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
- const string16& first_folder_name,
- int options) {
+ const string16& first_folder_name) {
Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
- first_folder_name, options, bookmarks.size()));
+ first_folder_name, bookmarks.size()));
std::vector<ProfileWriter::BookmarkEntry>::const_iterator it;
for (it = bookmarks.begin(); it < bookmarks.end();
diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h
index a81b8164..3347d40 100644
--- a/chrome/profile_import/profile_import_thread.h
+++ b/chrome/profile_import/profile_import_thread.h
@@ -56,8 +56,7 @@ class ProfileImportThread : public ChildThread {
void NotifyHomePageImportReady(const GURL& home_page);
void NotifyBookmarksImportReady(
const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
- const string16& first_folder_name,
- int options);
+ const string16& first_folder_name);
void NotifyFaviconsImportReady(
const std::vector<history::ImportedFaviconUsage>& favicons);
void NotifyPasswordFormReady(const webkit_glue::PasswordForm& form);
@@ -76,8 +75,7 @@ class ProfileImportThread : public ChildThread {
void OnImportStart(
const importer::SourceProfile& source_profile,
uint16 items,
- const DictionaryValue& localized_strings,
- bool import_to_bookmark_bar);
+ const DictionaryValue& localized_strings);
// Calls cleanup to stop the import operation.
void OnImportCancel();