chrome/utility/importer/bookmarks_file_importer.cc - Issue 616763002: Importing certain bookmarks from firefox and HTML file as search engines.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Addressed dependency issue. Created 5 years, 11 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

« no previous file with comments | « chrome/utility/importer/bookmark_html_reader_unittest.cc ('k') | chrome/utility/importer/external_process_importer_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..502c73df0813fafaf1528299cf82a41460d7aec2 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,8 @@ void BookmarksFileImporter::StartImport(

bridge->GetLocalizedString(IDS_BOOKMARK_GROUP);

bridge->AddBookmarks(bookmarks, first_folder_name);

}

+ if (!search_engines.empty())

+ bridge->SetKeywords(search_engines, false);

if (!favicons.empty())

bridge->SetFavicons(favicons);