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

Unified Diff: chrome/utility/importer/bookmarks_file_importer.cc

Issue 616763002: Importing certain bookmarks from firefox and HTML file as search engines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replacing custom code by existing function for checking if an url supports replacement terms. Created 6 years, 1 month 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/utility/importer/bookmarks_file_importer.cc
diff --git a/chrome/utility/importer/bookmarks_file_importer.cc b/chrome/utility/importer/bookmarks_file_importer.cc
index 387257de20d20f60befe1f70d458fcbf0b36d022..517ea75e93b1a9b202847d3f437ba6bee41b5ab5 100644
--- a/chrome/utility/importer/bookmarks_file_importer.cc
+++ b/chrome/utility/importer/bookmarks_file_importer.cc
@@ -90,6 +90,7 @@ void BookmarksFileImporter::StartImport(
bridge->NotifyItemStarted(importer::FAVORITES);
std::vector<ImportedBookmarkEntry> bookmarks;
+ std::vector<importer::SearchEngineInfo> search_engines;
std::vector<ImportedFaviconUsage> favicons;
bookmark_html_reader::ImportBookmarksFile(
@@ -97,6 +98,7 @@ void BookmarksFileImporter::StartImport(
base::Bind(internal::CanImportURL),
source_profile.source_path,
&bookmarks,
+ &search_engines,
&favicons);
if (!bookmarks.empty() && !cancelled()) {
@@ -104,6 +106,9 @@ void BookmarksFileImporter::StartImport(
bridge->GetLocalizedString(IDS_BOOKMARK_GROUP);
bridge->AddBookmarks(bookmarks, first_folder_name);
}
+ if (!search_engines.empty()) {
+ bridge->SetKeywords(search_engines, false);
+ }
Ilya Sherman 2014/11/07 00:22:35 nit: No need for curly braces.
Tapu Ghose 2014/11/09 14:03:07 Done.
if (!favicons.empty())
bridge->SetFavicons(favicons);

Powered by Google App Engine
This is Rietveld 408576698