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

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

Issue 14575004: Extract BookmarksFileImporter from Firefox2Importer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 7 years, 7 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/external_process_importer_bridge.cc
diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc
index 43c632246b7f49b28c37ca22f5cbd46fec4749ac..daad432d64f6392515a35e489cf6ac8dbf28e0a8 100644
--- a/chrome/browser/importer/external_process_importer_bridge.cc
+++ b/chrome/browser/importer/external_process_importer_bridge.cc
@@ -10,6 +10,7 @@
#include "base/task_runner.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/importer/profile_import_process_messages.h"
#include "content/public/common/password_form.h"
@@ -40,16 +41,16 @@ ExternalProcessImporterBridge::ExternalProcessImporterBridge(
}
void ExternalProcessImporterBridge::AddBookmarks(
- const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
+ const std::vector<ImportedBookmarkEntry>& bookmarks,
const string16& first_folder_name) {
Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
first_folder_name, bookmarks.size()));
- std::vector<ProfileWriter::BookmarkEntry>::const_iterator it;
+ std::vector<ImportedBookmarkEntry>::const_iterator it;
for (it = bookmarks.begin(); it < bookmarks.end();
it = it + kNumBookmarksToSend) {
- std::vector<ProfileWriter::BookmarkEntry> bookmark_group;
- std::vector<ProfileWriter::BookmarkEntry>::const_iterator end_group =
+ std::vector<ImportedBookmarkEntry> bookmark_group;
+ std::vector<ImportedBookmarkEntry>::const_iterator end_group =
it + kNumBookmarksToSend < bookmarks.end() ?
it + kNumBookmarksToSend : bookmarks.end();
bookmark_group.assign(it, end_group);

Powered by Google App Engine
This is Rietveld 408576698